diff options
Diffstat (limited to 'bootloader')
-rw-r--r-- | bootloader/x1000/x1000bootloader.h | 7 | ||||
-rw-r--r-- | bootloader/xduoox3.c | 19 |
2 files changed, 3 insertions, 23 deletions
diff --git a/bootloader/x1000/x1000bootloader.h b/bootloader/x1000/x1000bootloader.h index 7118017a23..0b5b02969d 100644 --- a/bootloader/x1000/x1000bootloader.h +++ b/bootloader/x1000/x1000bootloader.h | |||
@@ -107,10 +107,9 @@ struct uimage_header; | |||
107 | " init=/linuxrc ubi.mtd=4 root=ubi0:rootfs ubi.mtd=5 rootfstype=ubifs \ | 107 | " init=/linuxrc ubi.mtd=4 root=ubi0:rootfs ubi.mtd=5 rootfstype=ubifs \ |
108 | sn_no=00000000000000000000000000000000 bt_mac=xxxxxxxxxxxx wifi_mac=xxxxxxxxxxxx rw" | 108 | sn_no=00000000000000000000000000000000 bt_mac=xxxxxxxxxxxx wifi_mac=xxxxxxxxxxxx rw" |
109 | # define OF_PLAYER_BTN BUTTON_PLAY | 109 | # define OF_PLAYER_BTN BUTTON_PLAY |
110 | /* Note: OF Recovery boots, but is otherwise untested. */ | 110 | # define OF_RECOVERY_NAME "Aigo Recovery" |
111 | //# define OF_RECOVERY_NAME "Aigo Recovery" | 111 | # define OF_RECOVERY_ADDR 0x900000 |
112 | //# define OF_RECOVERY_ADDR 0x900000 | 112 | # define OF_RECOVERY_LENGTH (7 * 1024 * 1024) |
113 | //# define OF_RECOVERY_LENGTH (7 * 1024 * 1024) | ||
114 | # define OF_RECOVERY_ARGS \ | 113 | # define OF_RECOVERY_ARGS \ |
115 | "console=ttyS2,115200n8 mem=32M@0x0 no_console_suspend lpj=5009408 ip=off" | 114 | "console=ttyS2,115200n8 mem=32M@0x0 no_console_suspend lpj=5009408 ip=off" |
116 | #else | 115 | #else |
diff --git a/bootloader/xduoox3.c b/bootloader/xduoox3.c index ff6b81aa25..ac2d648e61 100644 --- a/bootloader/xduoox3.c +++ b/bootloader/xduoox3.c | |||
@@ -160,25 +160,6 @@ static int boot_rockbox(void) | |||
160 | } | 160 | } |
161 | } | 161 | } |
162 | 162 | ||
163 | #if 0 | ||
164 | static void reset_configuration(void) | ||
165 | { | ||
166 | int rc; | ||
167 | |||
168 | rc = disk_mount_all(); | ||
169 | if (rc <= 0) | ||
170 | { | ||
171 | verbose = true; | ||
172 | error(EDISK,rc, true); | ||
173 | } | ||
174 | |||
175 | if(rename(ROCKBOX_DIR "/config.cfg", ROCKBOX_DIR "/config.old") == 0) | ||
176 | show_splash(HZ/2, "Configuration reset successfully!"); | ||
177 | else | ||
178 | show_splash(HZ/2, "Couldn't reset configuration!"); | ||
179 | } | ||
180 | #endif | ||
181 | |||
182 | int main(void) | 163 | int main(void) |
183 | { | 164 | { |
184 | int rc; | 165 | int rc; |