4 files changed, 5 insertions, 2 deletions

diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h
index bbfab01ba5..b7f1ca4b30 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config/iriverh100.h
@@ -172,6 +172,7 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
+#define FLASH_BASE             0x00000000
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_RAMIMAGE_ENTRY   0x00001000
 #define FLASH_ROMIMAGE_ENTRY   0x00100000
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h
index 77ee1382be..4b658bcf49 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config/iriverh120.h
@@ -178,6 +178,7 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
+#define FLASH_BASE             0x00000000
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_RAMIMAGE_ENTRY   0x00001000
 #define FLASH_ROMIMAGE_ENTRY   0x00100000
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h
index f901f160c6..e5805dd8f4 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config/iriverh300.h
@@ -187,6 +187,7 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
 
+#define FLASH_BASE             0x00000000
 #define BOOTLOADER_ENTRYPOINT  0x003F0000
 #define FLASH_RAMIMAGE_ENTRY   0x00001000
 #define FLASH_ROMIMAGE_ENTRY   0x00200000
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 1885acfffd..68d7958870 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -36,8 +36,8 @@ extern void system_init(void);
 extern long cpu_frequency;
 
 struct flash_header {
-    unsigned long magic;
-    unsigned long length;
+    uint32_t magic;
+    uint32_t length;
     char version[32];
 };