summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-10-08 20:39:46 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-10-08 20:39:46 +0000
commit4c3897eb154f67ec0231cb1b7a160954c57b6c14 (patch)
tree2da632b3274c9f59946de11ffe57aa75f6944072 /firmware/export
parentfe64bf2d02e36d8e83edbb171392e894909c1f10 (diff)
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.h5
-rw-r--r--firmware/export/config-e200.h5
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 @@
/* define this if you have a flash memory storage */
#define HAVE_FLASH_STORAGE
+#ifndef BOOTLOADER
#define HAVE_MULTIVOLUME
+#define HAVE_HOTSWAP
+#endif
#define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */
@@ -146,8 +149,6 @@
/* Type of LCD TODO: hopefully the same as the x5 but check this*/
#define CONFIG_LCD LCD_C200
-#define HAVE_HOTSWAP
-
/* Offset ( in the firmware file's header ) to the file CRC and data. These are
only used when loading the old format rockbox.e200 file */
#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 @@
/* define this if you have a flash memory storage */
#define HAVE_FLASH_STORAGE
+#ifndef BOOTLOADER
#define HAVE_MULTIVOLUME
+#define HAVE_HOTSWAP
+#endif
#define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */
@@ -140,8 +143,6 @@
/* Type of LCD TODO: hopefully the same as the x5 but check this*/
#define CONFIG_LCD LCD_X5
-#define HAVE_HOTSWAP
-
/* Offset ( in the firmware file's header ) to the file CRC and data. These are
only used when loading the old format rockbox.e200 file */
#define FIRMWARE_OFFSET_FILE_CRC 0x0