From e293bbb4514ce877a3d449ecbc7a216a790f627a Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Sat, 17 Mar 2007 19:07:20 +0000 Subject: 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 --- firmware/export/config-e200.h | 23 +++++++---------------- firmware/export/config-h10.h | 23 +++++++---------------- firmware/export/config-h10_5gb.h | 20 +++++++------------- 3 files changed, 21 insertions(+), 45 deletions(-) (limited to 'firmware/export') 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 @@ /* Type of LCD TODO: hopefully the same as the x5 but check this*/ #define CONFIG_LCD LCD_X5 -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0x8 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0c - -/* Offset ( in the firmware file's header ) to the file type */ -#define FIRMWARE_OFFSET_FILE_TYPE 0x1f8 - -/* Offset ( in the firmware file's header ) to the file model id */ -#define FIRMWARE_OFFSET_FILE_MODEL 0x1fc - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 0x200 +/* 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 +#define FIRMWARE_OFFSET_FILE_DATA 0x8 /* #define USB_IPODSTYLE */ @@ -136,8 +126,9 @@ /* Define this if you have adjustable CPU frequency */ /*#define HAVE_ADJUSTABLE_CPU_FREQ Let's say we don't for now*/ -#define BOOTFILE_EXT "e200" -#define BOOTFILE "rockbox." BOOTFILE_EXT +#define BOOTFILE_EXT "mi4" +#define BOOTFILE "rockbox." BOOTFILE_EXT +#define OLD_BOOTFILE "rockbox.e200" #define ICODE_ATTR_TREMOR_NOT_MDCT 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 @@ /* We're able to shut off power to the HDD */ #define HAVE_ATA_POWER_OFF -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0x8 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0c - -/* Offset ( in the firmware file's header ) to the file type */ -#define FIRMWARE_OFFSET_FILE_TYPE 0x1f8 - -/* Offset ( in the firmware file's header ) to the file model id */ -#define FIRMWARE_OFFSET_FILE_MODEL 0x1fc - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 0x200 +/* Offset ( in the firmware file's header ) to the file CRC and data. These are + only used when loading the old format rockbox.h10 file */ +#define FIRMWARE_OFFSET_FILE_CRC 0x0 +#define FIRMWARE_OFFSET_FILE_DATA 0x8 /* #define USB_IPODSTYLE */ @@ -166,8 +156,9 @@ /* Define this if you have adjustable CPU frequency */ /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ -#define BOOTFILE_EXT "h10" -#define BOOTFILE "rockbox." BOOTFILE_EXT +#define BOOTFILE_EXT "mi4" +#define BOOTFILE "rockbox." BOOTFILE_EXT +#define OLD_BOOTFILE "rockbox.h10" #define ICODE_ATTR_TREMOR_NOT_MDCT 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 @@ /* Offset ( in the firmware file's header ) to the file length */ #define FIRMWARE_OFFSET_FILE_LENGTH 0x8 -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0c - -/* Offset ( in the firmware file's header ) to the file type */ -#define FIRMWARE_OFFSET_FILE_TYPE 0x1f8 - -/* Offset ( in the firmware file's header ) to the file model id */ -#define FIRMWARE_OFFSET_FILE_MODEL 0x1fc - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 0x200 +/* Offset ( in the firmware file's header ) to the file CRC and data. These are + only used when loading the old format rockbox.h10 file */ +#define FIRMWARE_OFFSET_FILE_CRC 0x0 +#define FIRMWARE_OFFSET_FILE_DATA 0x8 /* #define USB_IPODSTYLE */ @@ -146,8 +139,9 @@ /* Define this if you have adjustable CPU frequency */ /*#define HAVE_ADJUSTABLE_CPU_FREQ*/ -#define BOOTFILE_EXT "h10" -#define BOOTFILE "rockbox." BOOTFILE_EXT +#define BOOTFILE_EXT "mi4" +#define BOOTFILE "rockbox." BOOTFILE_EXT +#define OLD_BOOTFILE "rockbox.h10" #define ICODE_ATTR_TREMOR_NOT_MDCT -- cgit v1.2.3