diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-08 22:52:53 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-08 22:52:53 +0000 |
| commit | 1550bdcea6f90184f95c40a2904e827dab6f6395 (patch) | |
| tree | 534fb10b93c8b0f779393cc5c5483035c4b994ae /firmware | |
| parent | 6da4e33aacde6fc96a9d056ca8508407800aee76 (diff) | |
| download | rockbox-1550bdcea6f90184f95c40a2904e827dab6f6395.tar.gz rockbox-1550bdcea6f90184f95c40a2904e827dab6f6395.zip | |
Unified the H100 and H300 startup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7792 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/crt0.S | 4 | ||||
| -rw-r--r-- | firmware/export/config-h100.h | 4 | ||||
| -rw-r--r-- | firmware/export/config-h120.h | 4 | ||||
| -rw-r--r-- | firmware/export/config-h300.h | 9 |
4 files changed, 13 insertions, 8 deletions
diff --git a/firmware/crt0.S b/firmware/crt0.S index 62566c8065..84ada63d72 100644 --- a/firmware/crt0.S +++ b/firmware/crt0.S @@ -242,7 +242,7 @@ irq_handler: pop r1, r0 ret_irq -#elif defined(IRIVER_H100_SERIES) +#elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) /* Platform: iRiver H120/H140 */ move.w #0x2700,%sr @@ -274,7 +274,7 @@ irq_handler: /* Chip select 0 - Flash ROM */ moveq.l #0x00,%d0 /* CSAR0 - Base = 0x00000000 */ move.l %d0,(0x080,%a0) - move.l #0x001f0001,%d0 /* CSMR0 - 2M, All access */ + move.l #FLASH_SIZE-0x10000+1,%d0 /* CSMR0 - All access */ move.l %d0,(0x084,%a0) move.l #0x00000180,%d0 /* CSCR0 - no wait states, 16 bits, no bursts */ move.l %d0,(0x088,%a0) diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index e5de9cd19b..1426913d41 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -71,8 +71,8 @@ /* define this if the hardware can be powered off while charging */ #define HAVE_POWEROFF_WHILE_CHARGING -/* The start address index for ROM builds */ -#define ROM_START 0x11010 +/* The size of the flash ROM */ +#define FLASH_SIZE 0x200000 /* Define this for LCD backlight available */ #define CONFIG_BACKLIGHT BL_IRIVER /* port controlled */ diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 610dd848dc..72bc770bde 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -66,8 +66,8 @@ /* define this if the hardware can be powered off while charging */ #define HAVE_POWEROFF_WHILE_CHARGING -/* The start address index for ROM builds */ -#define ROM_START 0x11010 +/* The size of the flash ROM */ +#define FLASH_SIZE 0x200000 /* Define this for LCD backlight available */ #define CONFIG_BACKLIGHT BL_IRIVER /* port controlled */ diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 5deeef8a43..7bdc5ab609 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -1,3 +1,8 @@ +/* + * This config file is for iriver H320, H340 + */ +#define IRIVER_H300_SERIES 1 + /* For Rolo and boot loader */ #define MODEL_NUMBER 2 @@ -60,8 +65,8 @@ /* define this if the hardware can be powered off while charging */ #define HAVE_POWEROFF_WHILE_CHARGING -/* The start address index for ROM builds */ -#define ROM_START 0x11010 +/* The size of the flash ROM */ +#define FLASH_SIZE 0x400000 /* Define this for LCD backlight available */ #define CONFIG_BACKLIGHT BL_IRIVER /* port controlled */ |