diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-10-08 20:39:46 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-10-08 20:39:46 +0000 |
commit | 4c3897eb154f67ec0231cb1b7a160954c57b6c14 (patch) | |
tree | 2da632b3274c9f59946de11ffe57aa75f6944072 /firmware/export | |
parent | fe64bf2d02e36d8e83edbb171392e894909c1f10 (diff) | |
download | rockbox-4c3897eb154f67ec0231cb1b7a160954c57b6c14.tar.gz rockbox-4c3897eb154f67ec0231cb1b7a160954c57b6c14.zip |
Hopefully take care of FS#7806 - Current Sansapatcher fails to boot OF by removing all hotswap support from the bootloader. It won't fully be closed until Sansapatcher is updated of course. There's still a report of the partition dump not working unless 20 bytes of padding are inserted at the start of main() but that's only a developer-enabled feature. Seems weird though.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15038 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-c200.h | 5 | ||||
-rw-r--r-- | firmware/export/config-e200.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h index 6397dd8338..d4c594a91e 100644 --- a/firmware/export/config-c200.h +++ b/firmware/export/config-c200.h | |||
@@ -110,7 +110,10 @@ | |||
110 | /* define this if you have a flash memory storage */ | 110 | /* define this if you have a flash memory storage */ |
111 | #define HAVE_FLASH_STORAGE | 111 | #define HAVE_FLASH_STORAGE |
112 | 112 | ||
113 | #ifndef BOOTLOADER | ||
113 | #define HAVE_MULTIVOLUME | 114 | #define HAVE_MULTIVOLUME |
115 | #define HAVE_HOTSWAP | ||
116 | #endif | ||
114 | 117 | ||
115 | #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ | 118 | #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ |
116 | #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ | 119 | #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ |
@@ -146,8 +149,6 @@ | |||
146 | /* Type of LCD TODO: hopefully the same as the x5 but check this*/ | 149 | /* Type of LCD TODO: hopefully the same as the x5 but check this*/ |
147 | #define CONFIG_LCD LCD_C200 | 150 | #define CONFIG_LCD LCD_C200 |
148 | 151 | ||
149 | #define HAVE_HOTSWAP | ||
150 | |||
151 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are | 152 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are |
152 | only used when loading the old format rockbox.e200 file */ | 153 | only used when loading the old format rockbox.e200 file */ |
153 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 | 154 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 |
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 3bde3fc204..2528cc0760 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h | |||
@@ -104,7 +104,10 @@ | |||
104 | /* define this if you have a flash memory storage */ | 104 | /* define this if you have a flash memory storage */ |
105 | #define HAVE_FLASH_STORAGE | 105 | #define HAVE_FLASH_STORAGE |
106 | 106 | ||
107 | #ifndef BOOTLOADER | ||
107 | #define HAVE_MULTIVOLUME | 108 | #define HAVE_MULTIVOLUME |
109 | #define HAVE_HOTSWAP | ||
110 | #endif | ||
108 | 111 | ||
109 | #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ | 112 | #define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ |
110 | #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ | 113 | #define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ |
@@ -140,8 +143,6 @@ | |||
140 | /* Type of LCD TODO: hopefully the same as the x5 but check this*/ | 143 | /* Type of LCD TODO: hopefully the same as the x5 but check this*/ |
141 | #define CONFIG_LCD LCD_X5 | 144 | #define CONFIG_LCD LCD_X5 |
142 | 145 | ||
143 | #define HAVE_HOTSWAP | ||
144 | |||
145 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are | 146 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are |
146 | only used when loading the old format rockbox.e200 file */ | 147 | only used when loading the old format rockbox.e200 file */ |
147 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 | 148 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 |