Index: tools/configure =================================================================== --- tools/configure (revision 16246) +++ tools/configure (working copy) @@ -877,6 +877,7 @@ bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0" output="rockbox.iriver" appextra="recorder:gui" + flash="$pwd/rombox.iriver" plugins="yes" swcodec="yes" # toolset is the tools within the tools directory that we build for Index: apps/plugins/iriver_flash.c =================================================================== --- apps/plugins/iriver_flash.c (revision 16246) +++ apps/plugins/iriver_flash.c (working copy) @@ -27,7 +27,7 @@ unsigned char *audiobuf; ssize_t audiobuf_size; -#if defined(IRIVER_H120) +#if defined(IRIVER_H120) || defined(IRIVER_H100) #define PLATFORM_ID ID_IRIVER_H100 #else #undef PLATFORM_ID /* this platform is not (yet) flashable */ @@ -329,7 +329,7 @@ } /* Verify the checksum */ - sum = 0; + sum = MODEL_NUMBER; for (i = 0; i < len; i++) sum += audiobuf[i]; @@ -391,11 +391,13 @@ return -1; p8 = (char *)BOOTLOADER_ENTRYPOINT; + + /* Temporary disable for H100 FIXME once ready if (!detect_valid_bootloader(p8, 0)) { rb->splash(HZ*3, "Incompatible bootloader"); return -1; - } + } */ if (!rb->detect_original_firmware()) { @@ -483,7 +485,7 @@ p8 = (char *)get_section_address(section); p8 += sizeof(struct flash_header); - sum = 0; + sum = MODEL_NUMBER; for (i = 0; i < len; i++) sum += p8[i]; @@ -538,11 +540,15 @@ } /* Verify the crc32 checksum also. */ + /* Disable crc32 checksum for the H100 series until we are sure that this + works on these targets as well. Uncomment this as soon as someone + releases a new bootloader with checksums of both targets. if (!detect_valid_bootloader(audiobuf, len)) { rb->splash(HZ*3, "Incompatible/Untested bootloader"); return -1; } + */ rb->lcd_puts(0, 3, "Flashing..."); rb->lcd_update(); @@ -573,7 +579,7 @@ /* Verify */ p8 = (char *)BOOTLOADER_ENTRYPOINT; - sum = 0; + sum = MODEL_NUMBER; for (i = 0; i < len; i++) sum += p8[i]; Index: firmware/export/config-h100.h =================================================================== --- firmware/export/config-h100.h (revision 16246) +++ firmware/export/config-h100.h (working copy) @@ -114,7 +114,7 @@ /* Define this if you can run rockbox from flash memory */ /* In theory we can, but somebody needs to verify there are no issues. */ -// #define HAVE_FLASHED_ROCKBOX +#define HAVE_FLASHED_ROCKBOX /* define this if the hardware can be powered off while charging */ #define HAVE_POWEROFF_WHILE_CHARGING @@ -149,9 +149,9 @@ #define FLASH_MAGIC 0xfbfbfbf2 /* Define this if there is an EEPROM chip */ -/* Someone with H100 and BDM, please verify if this works and remove these - ugly comments then. */ -// #define HAVE_EEPROM +#define HAVE_EEPROM +/* Define this if the EEPROM chip is used */ +#define HAVE_EEPROM_SETTINGS #endif /* !SIMULATOR */