rolo: simplify parsing scramble header in load_firmware()

The standard load_firmware() function is used on targets which
use the "scramble -add" method for generating Rockbox binaries.

While it tries to be a bit more generic and allows the CRC/data
offsets to be placed anywhere in the file, there are no targets
which actually need this flexibility, because they are all using
plain old "scramble -add".

So we can actually simplify load_firmware() and remove defines
from the target headers. All the targets used CRC offset = 0 and
data offset = 8, except for a few which I assume never supported
ROLO or were never tested -- eg. samsungyh820: the CRC and data
offsets cannot both be 0.

The actual motivation for this is removing the calls to lseek(),
which can help make bootloaders a tiny bit smaller, as lseek is
typically not used anywhere else in bootloaders.

Change-Id: Ic2d01e5b75a32e88363f085e3e839146a0710bf4

92 files changed, 4 insertions, 532 deletions

diff --git a/firmware/common/rb-loader.c b/firmware/common/rb-loader.c
index 430ed6ec7b..0256f21884 100644
--- a/firmware/common/rb-loader.c
+++ b/firmware/common/rb-loader.c
@@ -58,16 +58,15 @@ static int load_firmware_filename(unsigned char* buf,
         goto end;
     }
 
-    lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET);
-
-    if (read(fd, &chksum, 4) < 4)
+    /* read 32-bit checksum followed by 4-byte model name,
+     * this is the "scramble -add" header written by tools/scramble */
+    if (read(fd, buf, 8) < 8)
     {
         ret = EREAD_CHKSUM_FAILED;
         goto end;
     }
-    chksum = betoh32(chksum); /* Rockbox checksums are big-endian */
 
-    lseek(fd, FIRMWARE_OFFSET_FILE_DATA, SEEK_SET);
+    chksum = load_be32(buf); /* Rockbox checksums are big-endian */
 
     if (read(fd, buf, len) < len)
     {
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h
index ac0e2141a1..dcf996ebc3 100644
--- a/firmware/export/config/android.h
+++ b/firmware/export/config/android.h
@@ -86,12 +86,6 @@
 #define CPU_FREQ 48000000
 */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index 51b5495680..5912fb63eb 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -157,12 +157,6 @@
 
 #define INCLUDE_TIMEOUT_API
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 #define BOOTFILE_EXT "d2"
diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h
index a3bb3a0ac6..b1f438c354 100644
--- a/firmware/export/config/creativezen.h
+++ b/firmware/export/config/creativezen.h
@@ -171,11 +171,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZEN
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h
index 77775f2eab..696112f9dc 100644
--- a/firmware/export/config/creativezenmozaic.h
+++ b/firmware/export/config/creativezenmozaic.h
@@ -169,11 +169,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZENMOZAIC
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h
index bc05954264..b103c34f20 100644
--- a/firmware/export/config/creativezenv.h
+++ b/firmware/export/config/creativezenv.h
@@ -166,11 +166,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZENV
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h
index d384a45333..34cde37d9a 100644
--- a/firmware/export/config/creativezenxfi.h
+++ b/firmware/export/config/creativezenxfi.h
@@ -176,11 +176,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZEN
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h
index 979ed4ab2d..47a600e8f5 100644
--- a/firmware/export/config/creativezenxfi2.h
+++ b/firmware/export/config/creativezenxfi2.h
@@ -180,11 +180,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZXFI2
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h
index f7acbf39bc..a558c2a7df 100644
--- a/firmware/export/config/creativezenxfi3.h
+++ b/firmware/export/config/creativezenxfi3.h
@@ -185,11 +185,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZXFI3
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h
index fe4e274b75..665f1c1ae5 100644
--- a/firmware/export/config/creativezenxfistyle.h
+++ b/firmware/export/config/creativezenxfistyle.h
@@ -174,11 +174,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_CREATIVEZENXFISTYLE
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h
index 54312e9071..f10ef2b83e 100644
--- a/firmware/export/config/creativezv.h
+++ b/firmware/export/config/creativezv.h
@@ -148,12 +148,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
 
diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h
index 4f87282f1f..f6e5b0d55e 100644
--- a/firmware/export/config/erosqnative.h
+++ b/firmware/export/config/erosqnative.h
@@ -8,8 +8,6 @@
 #define BOOTFILE_EXT "erosq"
 #define BOOTFILE     "rockbox." BOOTFILE_EXT
 #define BOOTDIR      "/.rockbox"
-#define FIRMWARE_OFFSET_FILE_CRC  0
-#define FIRMWARE_OFFSET_FILE_DATA 8
 
 /* CPU defines */
 #define CONFIG_CPU      X1000
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3k.h
index 86a9b05402..cf8509405f 100644
--- a/firmware/export/config/fiiom3k.h
+++ b/firmware/export/config/fiiom3k.h
@@ -4,8 +4,6 @@
 #define BOOTFILE_EXT    "m3k"
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR         "/.rockbox"
-#define FIRMWARE_OFFSET_FILE_CRC    0
-#define FIRMWARE_OFFSET_FILE_DATA   8
 
 /* CPU defines */
 #define CONFIG_CPU          X1000
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config/gigabeatfx.h
index 738d7a8eec..10ca6dd20e 100644
--- a/firmware/export/config/gigabeatfx.h
+++ b/firmware/export/config/gigabeatfx.h
@@ -176,12 +176,6 @@
 
 #define CONFIG_LCD LCD_GIGABEAT
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
 
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index edf76d0e98..987afd4e4e 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -235,12 +235,6 @@
 
 #define CONFIG_LCD LCD_GIGABEATS
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 //#define HAVE_SERIAL
 #define HAVE_VOLUME_IN_LIST
 
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h
index dec114b339..9f611317e5 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -181,11 +181,6 @@
 /* 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 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h
index afe77d36b2..18a1e8012b 100644
--- a/firmware/export/config/gogearhdd6330.h
+++ b/firmware/export/config/gogearhdd6330.h
@@ -186,11 +186,6 @@
 /* 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 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h
index 0a4dbad006..c2cfc306d9 100644
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config/gogearsa9200.h
@@ -185,10 +185,6 @@
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* These values are unused, but need to be defined */
-#define FIRMWARE_OFFSET_FILE_CRC    0x0
-#define FIRMWARE_OFFSET_FILE_DATA   0x8
-
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
 #define INCLUDE_TIMEOUT_API
diff --git a/firmware/export/config/hifietma8.h b/firmware/export/config/hifietma8.h
index a9b94227d8..b834ba2b87 100644
--- a/firmware/export/config/hifietma8.h
+++ b/firmware/export/config/hifietma8.h
@@ -134,12 +134,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/hifietma8c.h b/firmware/export/config/hifietma8c.h
index 009c4ee353..7f9014f92a 100644
--- a/firmware/export/config/hifietma8c.h
+++ b/firmware/export/config/hifietma8c.h
@@ -134,12 +134,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/hifietma9.h b/firmware/export/config/hifietma9.h
index 454b3b17ff..dcd32ebd3b 100644
--- a/firmware/export/config/hifietma9.h
+++ b/firmware/export/config/hifietma9.h
@@ -134,12 +134,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/hifietma9c.h b/firmware/export/config/hifietma9c.h
index e9817e40d6..7767131882 100644
--- a/firmware/export/config/hifietma9c.h
+++ b/firmware/export/config/hifietma9c.h
@@ -134,12 +134,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h
index 84f65f1c81..a2030715bc 100644
--- a/firmware/export/config/hifimanhm60x.h
+++ b/firmware/export/config/hifimanhm60x.h
@@ -168,12 +168,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h
index 0879cd2980..acf6d5ab62 100644
--- a/firmware/export/config/hifimanhm801.h
+++ b/firmware/export/config/hifimanhm801.h
@@ -156,12 +156,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h
index cfac0d7253..b1af9f5458 100644
--- a/firmware/export/config/iaudiom3.h
+++ b/firmware/export/config/iaudiom3.h
@@ -144,12 +144,6 @@
 /* FIXME: implement hardware LED handling */
 /* #define CONFIG_LED LED_REAL */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h
index e7b46868b7..6f5038b788 100644
--- a/firmware/export/config/iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
@@ -165,12 +165,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h
index cae83dd952..1724341fca 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
@@ -174,12 +174,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_M5636
 
diff --git a/firmware/export/config/ibassodx50.h b/firmware/export/config/ibassodx50.h
index 2161d9f3e3..f2521c2782 100644
--- a/firmware/export/config/ibassodx50.h
+++ b/firmware/export/config/ibassodx50.h
@@ -127,12 +127,6 @@
 /* define this if the hardware can be powered off while charging */
 #define HAVE_POWEROFF_WHILE_CHARGING
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/ibassodx90.h b/firmware/export/config/ibassodx90.h
index 570a8d2a35..21d07a9112 100644
--- a/firmware/export/config/ibassodx90.h
+++ b/firmware/export/config/ibassodx90.h
@@ -124,12 +124,6 @@
 /* define this if the hardware can be powered off while charging */
 #define HAVE_POWEROFF_WHILE_CHARGING
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/ihifi760.h b/firmware/export/config/ihifi760.h
index d58d6b9dfb..cc4152f5d8 100644
--- a/firmware/export/config/ihifi760.h
+++ b/firmware/export/config/ihifi760.h
@@ -168,12 +168,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ihifi770.h b/firmware/export/config/ihifi770.h
index f6bc747bc6..74b12de994 100644
--- a/firmware/export/config/ihifi770.h
+++ b/firmware/export/config/ihifi770.h
@@ -144,12 +144,6 @@
 /* Define this if your LCD can set contrast */
 /* #define HAVE_LCD_CONTRAST */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ihifi770c.h b/firmware/export/config/ihifi770c.h
index 82f12c968b..8224e2f368 100644
--- a/firmware/export/config/ihifi770c.h
+++ b/firmware/export/config/ihifi770c.h
@@ -144,12 +144,6 @@
 /* Define this if your LCD can set contrast */
 /* #define HAVE_LCD_CONTRAST */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ihifi800.h b/firmware/export/config/ihifi800.h
index ac58029216..91981682c1 100644
--- a/firmware/export/config/ihifi800.h
+++ b/firmware/export/config/ihifi800.h
@@ -145,12 +145,6 @@
 /* Define this if your LCD can set contrast */
 /* #define HAVE_LCD_CONTRAST */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ihifi960.h b/firmware/export/config/ihifi960.h
index 9f8b3ef443..64c6c90874 100644
--- a/firmware/export/config/ihifi960.h
+++ b/firmware/export/config/ihifi960.h
@@ -168,12 +168,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h
index fd497c7469..5cc8770bb3 100644
--- a/firmware/export/config/ipod1g2g.h
+++ b/firmware/export/config/ipod1g2g.h
@@ -160,15 +160,6 @@
 
 #define CONFIG_LCD LCD_IPOD2BPP
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define USB_HANDLED_BY_OF
 /* actually firewire only, but handled like USB */
 
diff --git a/firmware/export/config/ipod3g.h b/firmware/export/config/ipod3g.h
index ae94ea7d63..c42702e2df 100644
--- a/firmware/export/config/ipod3g.h
+++ b/firmware/export/config/ipod3g.h
@@ -170,15 +170,6 @@
 
 #define CONFIG_LCD LCD_IPOD2BPP
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define USB_HANDLED_BY_OF
 /* actually both firewire and USB, USB isn't handled yet */
 
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index 49996c4eee..80f4ccec65 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -189,15 +189,6 @@
 
 #define CONFIG_LCD LCD_IPOD2BPP
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index b03b1131bd..50aa5d8e8c 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -186,12 +186,6 @@
 /* define this if the hardware can be powered off while charging */
 #define HAVE_POWEROFF_WHILE_CHARGING
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you can read an absolute wheel position */
 #define HAVE_WHEEL_POSITION
 
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 93bea58daa..19e5326179 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -176,15 +176,6 @@
 
 #define CONFIG_LCD LCD_IPODCOLOR
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index b8f52ff936..3e8795adee 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -185,15 +185,6 @@
 
 #define CONFIG_LCD LCD_IPODMINI
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index c1cd45310c..7879737c46 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -186,15 +186,6 @@
 
 #define CONFIG_LCD LCD_IPODMINI
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h
index d919435cbd..8220ca54d9 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@@ -176,15 +176,6 @@
 
 #define CONFIG_LCD LCD_IPODNANO
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index 9445b2809a..be7b6579ee 100644
--- a/firmware/export/config/ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
@@ -183,12 +183,6 @@
 /* define this if the hardware can be powered off while charging */
 #define HAVE_POWEROFF_WHILE_CHARGING
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you can read an absolute wheel position */
 #define HAVE_WHEEL_POSITION
 
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index aec362a654..64200f4e61 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -196,15 +196,6 @@
 
 #define CONFIG_LCD LCD_IPODVIDEO
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index 6342a90deb..480f6db0f5 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -160,11 +160,6 @@
 /* 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 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h
index b7f1ca4b30..3d899674ef 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config/iriverh100.h
@@ -157,12 +157,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define HAVE_ATA_LED_CTRL
 
 /* Define this if you have adjustable CPU frequency */
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index d1ec64090e..67b11b276b 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -147,14 +147,6 @@
 /* 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 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h
index 4b658bcf49..28e7877f23 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config/iriverh120.h
@@ -163,12 +163,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define HAVE_ATA_LED_CTRL
 
 /* Define this if you have adjustable CPU frequency */
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h
index e5805dd8f4..8dbbc0cfdd 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config/iriverh300.h
@@ -171,12 +171,6 @@
 
 #define CONFIG_LCD LCD_H300
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ISP1362
 
diff --git a/firmware/export/config/lyreproto1.h b/firmware/export/config/lyreproto1.h
index 4cde26879c..c1b41b3223 100644
--- a/firmware/export/config/lyreproto1.h
+++ b/firmware/export/config/lyreproto1.h
@@ -94,12 +94,6 @@
 #define MCK_FREQ 99328000
 #define SLOW_CLOCK 32768
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define BOOTFILE_EXT "lyre_proto1"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config/meizum3.h
index c770790d47..17e24d7281 100644
--- a/firmware/export/config/meizum3.h
+++ b/firmware/export/config/meizum3.h
@@ -143,12 +143,6 @@
 /* Define this if you have ATA power-off control */
 //#define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 //#define CONFIG_USBOTG USBOTG_M5636
 
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config/meizum6sl.h
index 95841c8465..99f54ff187 100644
--- a/firmware/export/config/meizum6sl.h
+++ b/firmware/export/config/meizum6sl.h
@@ -143,12 +143,6 @@
 /* Define this if you have ATA power-off control */
 //#define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 //#define CONFIG_USBOTG USBOTG_M5636
 
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config/meizum6sp.h
index 13b4d2e6b5..332940e1ed 100644
--- a/firmware/export/config/meizum6sp.h
+++ b/firmware/export/config/meizum6sp.h
@@ -149,12 +149,6 @@
 /* Define this if you have ATA power-off control */
 //#define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 //#define CONFIG_USBOTG USBOTG_M5636
 
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h
index 5f57606378..4fc483b324 100644
--- a/firmware/export/config/mini2440.h
+++ b/firmware/export/config/mini2440.h
@@ -147,12 +147,6 @@
 #define CONFIG_CHARGING CHARGING_MONITOR
 /*#define POWER_INPUT_BATTERY 0*/
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define BOOTFILE_EXT "mini2440"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h
index a770183946..bced50dfe7 100644
--- a/firmware/export/config/mpiohd200.h
+++ b/firmware/export/config/mpiohd200.h
@@ -152,15 +152,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h
index d5b2948cec..f02a2125ec 100644
--- a/firmware/export/config/mpiohd300.h
+++ b/firmware/export/config/mpiohd300.h
@@ -155,15 +155,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file length */
-#define FIRMWARE_OFFSET_FILE_LENGTH 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index bb636f7625..790545c1c5 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -193,12 +193,6 @@
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR         "/.rockbox"
 
-/* Offset ( in the firmware file's header ) to the file CRC and data.
-   Not used for the mrobe 100, since it boots an mi4 file, but needed
-   for compatibility. */
-#define FIRMWARE_OFFSET_FILE_CRC    0x0
-#define FIRMWARE_OFFSET_FILE_DATA   0x0
-
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
 
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h
index 621c0b75ca..5b9240be94 100644
--- a/firmware/export/config/mrobe500.h
+++ b/firmware/export/config/mrobe500.h
@@ -238,12 +238,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h
index 5cdf42a11f..b145641586 100644
--- a/firmware/export/config/nokian8xx.h
+++ b/firmware/export/config/nokian8xx.h
@@ -79,12 +79,6 @@
 #define CPU_FREQ 48000000
 */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h
index e7084f9acb..cac8a66457 100644
--- a/firmware/export/config/nokian900.h
+++ b/firmware/export/config/nokian900.h
@@ -76,12 +76,6 @@
 #define CPU_FREQ 48000000
 */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index fe5a772167..7f4f1ea843 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -187,12 +187,6 @@ No access to the NAND yet..
 /* define this if you have a flash memory storage */
 #define HAVE_FLASH_STORAGE
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC  0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h
index ee65702fe0..8357c76026 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config/ondavx767.h
@@ -148,12 +148,6 @@
 /* define this if you have a flash memory storage */
 #define HAVE_FLASH_STORAGE
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index e03a0cdd04..ceea151d8c 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -178,12 +178,6 @@ No access to the NAND yet..
 /* define this if you have a flash memory storage */
 #define HAVE_FLASH_STORAGE
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC  0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h
index 41b2b44dad..377b8aa04e 100644
--- a/firmware/export/config/pandora.h
+++ b/firmware/export/config/pandora.h
@@ -79,12 +79,6 @@
 #define CPU_FREQ 48000000
 */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 369974abb7..967fc6d8ff 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -176,12 +176,6 @@
 /* define this if the hardware can be powered off while charging */
 /* #define HAVE_POWEROFF_WHILE_CHARGING */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index b04ae1c0ea..0cf70d89a2 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -191,12 +191,6 @@
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC    0x00
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA   0x00
-
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
 
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index 8367f06731..5ca5fea2a8 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -193,12 +193,6 @@
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC    0x00
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA   0x00
-
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
 
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index 8e467550d8..cb6f185014 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -184,12 +184,6 @@
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC    0x00
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA   0x00
-
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
 
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h
index 6306d23102..10f51f846f 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config/samsungyps3.h
@@ -141,12 +141,6 @@
 /* Define this if you have ATA power-off control */
 //#define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB */
 //#define HAVE_USBSTACK
 #define USB_VENDOR_ID 0x04E8
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h
index 4d5bf17256..46260b77d2 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config/sansac200.h
@@ -173,11 +173,6 @@
 /* Type of LCD TODO: hopefully the same as the x5 but check this*/
 #define CONFIG_LCD LCD_C200
 
-/* 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
-
 #ifndef BOOTLOADER
 #define HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index df306e88b0..3eb0c56f65 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -5,8 +5,6 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 44
 #define MODEL_NAME   "Sandisk Sansa c200v2 series"
-#define FIRMWARE_OFFSET_FILE_DATA 8
-#define FIRMWARE_OFFSET_FILE_CRC 0
 
 #define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index faab50590c..9a17cec736 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -5,8 +5,6 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 40
 #define MODEL_NAME   "Sandisk Sansa Clip"
-#define FIRMWARE_OFFSET_FILE_DATA 8
-#define FIRMWARE_OFFSET_FILE_CRC 0
 
 #define HW_SAMPR_CAPS       SAMPR_CAP_ALL_96
 
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 99eb1d8832..37142c6992 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -5,8 +5,6 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 66
 #define MODEL_NAME   "Sandisk Sansa Clip+"
-#define FIRMWARE_OFFSET_FILE_DATA 8
-#define FIRMWARE_OFFSET_FILE_CRC 0
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 /* define boot redirect file name allows booting from external drives */
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index 6e369db681..886779f57a 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -5,8 +5,6 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 60
 #define MODEL_NAME   "Sandisk Sansa Clipv2"
-#define FIRMWARE_OFFSET_FILE_DATA 8
-#define FIRMWARE_OFFSET_FILE_CRC 0
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index d8b18e1a18..e34a2857f6 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -5,8 +5,6 @@
 /* For Rolo and boot loader */
 #define MODEL_NUMBER 79
 #define MODEL_NAME   "Sandisk Sansa Zip"
-#define FIRMWARE_OFFSET_FILE_DATA 8
-#define FIRMWARE_OFFSET_FILE_CRC 0
 /* Define if boot data from bootloader has been enabled for the target */
 #define HAVE_BOOTDATA
 /* define boot redirect file name allows booting from external drives */
diff --git a/firmware/export/config/sansaconnect.h b/firmware/export/config/sansaconnect.h
index a06ea9b207..ef048084f2 100644
--- a/firmware/export/config/sansaconnect.h
+++ b/firmware/export/config/sansaconnect.h
@@ -183,12 +183,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Hardware controlled charging */
 #define CONFIG_CHARGING CHARGING_MONITOR
 
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index 6bb2df9bc8..1c10f74845 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -180,11 +180,6 @@
 /* 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 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 HAVE_MULTIDRIVE
 //#define HAVE_MULTIVOLUME
 #define NUM_DRIVES 2
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 27dd881e73..00833d56a6 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -187,11 +187,6 @@
 /* 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 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 HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index e8f7157deb..4bb5d18ceb 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -194,11 +194,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_FUZE
 
-/* 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 HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index 9b91e114bc..c96131e37d 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -184,11 +184,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_FUZEPLUS
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index 96d3b2deee..6d95d49f78 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -196,11 +196,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_FUZE
 
-/* 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 HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
 
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index 37f0931079..58cd096edb 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -131,12 +131,6 @@
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_USBOTG USBOTG_AS3525
 
 /* enable these for the experimental usb stack */
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h
index 78458fe3fc..4b5de553b9 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config/sansaview.h
@@ -154,12 +154,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_VIEW
 
-/* 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
-   Required for bootloader/common.c to compile */
-#define FIRMWARE_OFFSET_FILE_CRC    0x0
-#define FIRMWARE_OFFSET_FILE_DATA   0x8
-
 #ifndef BOOTLOADER
 #define HAVE_MULTIDRIVE
 #define NUM_DRIVES 2
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h
index 3286e377ce..4421e5e1ea 100644
--- a/firmware/export/config/sdlapp.h
+++ b/firmware/export/config/sdlapp.h
@@ -80,12 +80,6 @@
 #define CPU_FREQ 48000000
 */
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 #define CONFIG_LCD LCD_COWOND2
 
 /* Define this if a programmable hotkey is mapped */
diff --git a/firmware/export/config/shanlingq1.h b/firmware/export/config/shanlingq1.h
index 6f5365a97e..a708cfc2a9 100644
--- a/firmware/export/config/shanlingq1.h
+++ b/firmware/export/config/shanlingq1.h
@@ -4,8 +4,6 @@
 #define BOOTFILE_EXT    "q1"
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define BOOTDIR         "/.rockbox"
-#define FIRMWARE_OFFSET_FILE_CRC    0
-#define FIRMWARE_OFFSET_FILE_DATA   8
 
 /* CPU defines */
 #define CONFIG_CPU          X1000
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h
index 2dd6a929d3..0aeca695f0 100644
--- a/firmware/export/config/sim.h
+++ b/firmware/export/config/sim.h
@@ -23,10 +23,6 @@
 
 #undef ROM_START
 
-#undef FIRMWARE_OFFSET_FILE_LENGTH
-#undef FIRMWARE_OFFSET_FILE_CRC
-#undef FIRMWARE_OFFSET_FILE_DATA
-
 #undef AMS_OF_SIZE
 
 #undef HAVE_HOTSWAP_STORAGE_AS_MAIN
diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h
index e52dbfcac3..40b0a4feb7 100644
--- a/firmware/export/config/sonynwze360.h
+++ b/firmware/export/config/sonynwze360.h
@@ -155,11 +155,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_NWZE360
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h
index 5dd1c4bc9e..3ed2880d35 100644
--- a/firmware/export/config/sonynwze370.h
+++ b/firmware/export/config/sonynwze370.h
@@ -155,11 +155,6 @@
 /* Type of LCD */
 #define CONFIG_LCD LCD_NWZE370
 
-/* 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
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index edbc1e321a..b6d2e5082a 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -158,15 +158,6 @@
 /* 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 0
-
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* USB On-the-go */
 #define CONFIG_USBOTG USBOTG_ARC
 
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h
index ea86e60d59..46e1a61712 100644
--- a/firmware/export/config/xduoox3.h
+++ b/firmware/export/config/xduoox3.h
@@ -5,12 +5,6 @@
 #define MODEL_NAME   "xDuoo X3"
 #define MODEL_NUMBER 96
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC  0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Support FAT16 for SD cards <= 2GB */
 #define HAVE_FAT16SUPPORT
 
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h
index ff68345349..ef0eb000ba 100644
--- a/firmware/export/config/zenvisionm30gb.h
+++ b/firmware/export/config/zenvisionm30gb.h
@@ -149,12 +149,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
 
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h
index 7136595d94..ce7fb9fa30 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h
@@ -148,12 +148,6 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
-/* Offset ( in the firmware file's header ) to the file CRC */
-#define FIRMWARE_OFFSET_FILE_CRC 0
-
-/* Offset ( in the firmware file's header ) to the real data */
-#define FIRMWARE_OFFSET_FILE_DATA 8
-
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */