3 files changed, 17 insertions, 5 deletions

diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index ee3d70236a..9bfb9583dd 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -139,8 +139,9 @@
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
-#define FLASH_ENTRYPOINT       0x00001000
-#define FLASH_MAGIC            0xfbfbfbf1
+#define FLASH_RAMIMAGE_ENTRY   0x00001000
+#define FLASH_ROMIMAGE_ENTRY   0x00100000
+#define FLASH_MAGIC            0xfbfbfbf2
 
 /* Define this if there is an EEPROM chip */
 #define HAVE_EEPROM
diff --git a/firmware/export/eeprom_settings.h b/firmware/export/eeprom_settings.h
index 367e7b24e9..aade86bc0d 100644
--- a/firmware/export/eeprom_settings.h
+++ b/firmware/export/eeprom_settings.h
@@ -23,17 +23,26 @@
 #include <stdbool.h>
 #include "inttypes.h"
 
-#define EEPROM_SETTINGS_VERSION   0x24c01001
+#define EEPROM_SETTINGS_VERSION   0x24c01002
 #define EEPROM_SETTINGS_BL_MINVER 7
 
+enum boot_methods {
+    BOOT_DISK = 0,
+    BOOT_RAM,
+    BOOT_ROM,
+    BOOT_RECOVERY,
+};
+
 struct eeprom_settings
 {
     long version;       /* Settings version number */
     bool initialized;   /* Is eeprom_settings ready to be used */
     bool disk_clean;    /* Is disk intact from last reboot */
-    bool boot_disk;     /* Load firmware from disk (default=FLASH) */
+    uint8_t bootmethod; /* The default boot method. */
     uint8_t bl_version; /* Installed bootloader version */
     
+    long reserved;      /* A few reserved bits for the future. */
+    
     /* This must be the last entry */
     uint32_t checksum;  /* Checksum of this structure */
 };
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 94922871b6..86bbefb28f 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -52,7 +52,9 @@ struct flash_header {
     char version[32];
 };
 
-bool detect_flashed_rockbox(void);
+bool detect_flashed_romimage(void);
+bool detect_flashed_ramimage(void);
+bool detect_original_firmware(void);
 
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
 #define FREQ cpu_frequency