diff options
| author | Barry Wardell <rockbox@barrywardell.net> | 2007-03-17 19:07:20 +0000 |
|---|---|---|
| committer | Barry Wardell <rockbox@barrywardell.net> | 2007-03-17 19:07:20 +0000 |
| commit | e293bbb4514ce877a3d449ecbc7a216a790f627a (patch) | |
| tree | 6e9cceda48038e13ac517d534225bbeaeb46cdca /firmware | |
| parent | 3d39c4de289ba8f2d84fd38026273f9c4fa9a36a (diff) | |
| download | rockbox-e293bbb4514ce877a3d449ecbc7a216a790f627a.tar.gz rockbox-e293bbb4514ce877a3d449ecbc7a216a790f627a.zip | |
If loading rockbox.mi4 fails, then drop back to trying rockbox.h10/rockbox.e200 instead. This will allow the new bootloader to be used with older rockbox builds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12824 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/config-e200.h | 23 | ||||
| -rw-r--r-- | firmware/export/config-h10.h | 23 | ||||
| -rw-r--r-- | firmware/export/config-h10_5gb.h | 20 |
3 files changed, 21 insertions, 45 deletions
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h index 0126cdf739..094bd7f7b0 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h | |||
| @@ -107,20 +107,10 @@ | |||
| 107 | /* Type of LCD TODO: hopefully the same as the x5 but check this*/ | 107 | /* Type of LCD TODO: hopefully the same as the x5 but check this*/ |
| 108 | #define CONFIG_LCD LCD_X5 | 108 | #define CONFIG_LCD LCD_X5 |
| 109 | 109 | ||
| 110 | /* Offset ( in the firmware file's header ) to the file length */ | 110 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are |
| 111 | #define FIRMWARE_OFFSET_FILE_LENGTH 0x8 | 111 | only used when loading the old format rockbox.e200 file */ |
| 112 | 112 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 | |
| 113 | /* Offset ( in the firmware file's header ) to the file CRC */ | 113 | #define FIRMWARE_OFFSET_FILE_DATA 0x8 |
| 114 | #define FIRMWARE_OFFSET_FILE_CRC 0x0c | ||
| 115 | |||
| 116 | /* Offset ( in the firmware file's header ) to the file type */ | ||
| 117 | #define FIRMWARE_OFFSET_FILE_TYPE 0x1f8 | ||
| 118 | |||
| 119 | /* Offset ( in the firmware file's header ) to the file model id */ | ||
| 120 | #define FIRMWARE_OFFSET_FILE_MODEL 0x1fc | ||
| 121 | |||
| 122 | /* Offset ( in the firmware file's header ) to the real data */ | ||
| 123 | #define FIRMWARE_OFFSET_FILE_DATA 0x200 | ||
| 124 | 114 | ||
| 125 | /* #define USB_IPODSTYLE */ | 115 | /* #define USB_IPODSTYLE */ |
| 126 | 116 | ||
| @@ -136,8 +126,9 @@ | |||
| 136 | /* Define this if you have adjustable CPU frequency */ | 126 | /* Define this if you have adjustable CPU frequency */ |
| 137 | /*#define HAVE_ADJUSTABLE_CPU_FREQ Let's say we don't for now*/ | 127 | /*#define HAVE_ADJUSTABLE_CPU_FREQ Let's say we don't for now*/ |
| 138 | 128 | ||
| 139 | #define BOOTFILE_EXT "e200" | 129 | #define BOOTFILE_EXT "mi4" |
| 140 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 130 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
| 131 | #define OLD_BOOTFILE "rockbox.e200" | ||
| 141 | 132 | ||
| 142 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 133 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
| 143 | 134 | ||
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h index ec6f83fecb..18f78efb91 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h | |||
| @@ -137,20 +137,10 @@ | |||
| 137 | /* We're able to shut off power to the HDD */ | 137 | /* We're able to shut off power to the HDD */ |
| 138 | #define HAVE_ATA_POWER_OFF | 138 | #define HAVE_ATA_POWER_OFF |
| 139 | 139 | ||
| 140 | /* Offset ( in the firmware file's header ) to the file length */ | 140 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are |
| 141 | #define FIRMWARE_OFFSET_FILE_LENGTH 0x8 | 141 | only used when loading the old format rockbox.h10 file */ |
| 142 | 142 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 | |
| 143 | /* Offset ( in the firmware file's header ) to the file CRC */ | 143 | #define FIRMWARE_OFFSET_FILE_DATA 0x8 |
| 144 | #define FIRMWARE_OFFSET_FILE_CRC 0x0c | ||
| 145 | |||
| 146 | /* Offset ( in the firmware file's header ) to the file type */ | ||
| 147 | #define FIRMWARE_OFFSET_FILE_TYPE 0x1f8 | ||
| 148 | |||
| 149 | /* Offset ( in the firmware file's header ) to the file model id */ | ||
| 150 | #define FIRMWARE_OFFSET_FILE_MODEL 0x1fc | ||
| 151 | |||
| 152 | /* Offset ( in the firmware file's header ) to the real data */ | ||
| 153 | #define FIRMWARE_OFFSET_FILE_DATA 0x200 | ||
| 154 | 144 | ||
| 155 | /* #define USB_IPODSTYLE */ | 145 | /* #define USB_IPODSTYLE */ |
| 156 | 146 | ||
| @@ -166,8 +156,9 @@ | |||
| 166 | /* Define this if you have adjustable CPU frequency */ | 156 | /* Define this if you have adjustable CPU frequency */ |
| 167 | /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ | 157 | /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ |
| 168 | 158 | ||
| 169 | #define BOOTFILE_EXT "h10" | 159 | #define BOOTFILE_EXT "mi4" |
| 170 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 160 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
| 161 | #define OLD_BOOTFILE "rockbox.h10" | ||
| 171 | 162 | ||
| 172 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 163 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
| 173 | 164 | ||
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h index b809f3471c..1df9462ee6 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h | |||
| @@ -120,17 +120,10 @@ | |||
| 120 | /* Offset ( in the firmware file's header ) to the file length */ | 120 | /* Offset ( in the firmware file's header ) to the file length */ |
| 121 | #define FIRMWARE_OFFSET_FILE_LENGTH 0x8 | 121 | #define FIRMWARE_OFFSET_FILE_LENGTH 0x8 |
| 122 | 122 | ||
| 123 | /* Offset ( in the firmware file's header ) to the file CRC */ | 123 | /* Offset ( in the firmware file's header ) to the file CRC and data. These are |
| 124 | #define FIRMWARE_OFFSET_FILE_CRC 0x0c | 124 | only used when loading the old format rockbox.h10 file */ |
| 125 | 125 | #define FIRMWARE_OFFSET_FILE_CRC 0x0 | |
| 126 | /* Offset ( in the firmware file's header ) to the file type */ | 126 | #define FIRMWARE_OFFSET_FILE_DATA 0x8 |
| 127 | #define FIRMWARE_OFFSET_FILE_TYPE 0x1f8 | ||
| 128 | |||
| 129 | /* Offset ( in the firmware file's header ) to the file model id */ | ||
| 130 | #define FIRMWARE_OFFSET_FILE_MODEL 0x1fc | ||
| 131 | |||
| 132 | /* Offset ( in the firmware file's header ) to the real data */ | ||
| 133 | #define FIRMWARE_OFFSET_FILE_DATA 0x200 | ||
| 134 | 127 | ||
| 135 | /* #define USB_IPODSTYLE */ | 128 | /* #define USB_IPODSTYLE */ |
| 136 | 129 | ||
| @@ -146,8 +139,9 @@ | |||
| 146 | /* Define this if you have adjustable CPU frequency */ | 139 | /* Define this if you have adjustable CPU frequency */ |
| 147 | /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ | 140 | /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ |
| 148 | 141 | ||
| 149 | #define BOOTFILE_EXT "h10" | 142 | #define BOOTFILE_EXT "mi4" |
| 150 | #define BOOTFILE "rockbox." BOOTFILE_EXT | 143 | #define BOOTFILE "rockbox." BOOTFILE_EXT |
| 144 | #define OLD_BOOTFILE "rockbox.h10" | ||
| 151 | 145 | ||
| 152 | #define ICODE_ATTR_TREMOR_NOT_MDCT | 146 | #define ICODE_ATTR_TREMOR_NOT_MDCT |
| 153 | 147 | ||