diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-01-17 06:50:27 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-01-17 06:50:27 +0000 |
commit | bcc0f88372fd2be986a5e279dd7e3bd556d6c984 (patch) | |
tree | 149db74c9cb02a1e4b219cb168053b22e41ae82b /firmware/target/arm/iriver | |
parent | 62207228f717d0eb29aca5d1fbc155f151d6814e (diff) | |
download | rockbox-bcc0f88372fd2be986a5e279dd7e3bd556d6c984.tar.gz rockbox-bcc0f88372fd2be986a5e279dd7e3bd556d6c984.tar.bz2 rockbox-bcc0f88372fd2be986a5e279dd7e3bd556d6c984.zip |
Convert PortalPlayer iRivers to use USB-mode enabled bootloader. The H10 5/6GB already has a pre-boot USB mode (so it's a little redundant there) but building them the same way is simpler.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29067 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/iriver')
-rw-r--r-- | firmware/target/arm/iriver/boot.lds | 64 | ||||
-rw-r--r-- | firmware/target/arm/iriver/usb-target.h | 4 |
2 files changed, 5 insertions, 63 deletions
diff --git a/firmware/target/arm/iriver/boot.lds b/firmware/target/arm/iriver/boot.lds index 10bde4e9d5..ed4fc351fe 100644 --- a/firmware/target/arm/iriver/boot.lds +++ b/firmware/target/arm/iriver/boot.lds @@ -1,64 +1,2 @@ #include "config.h" - -ENTRY(start) -OUTPUT_FORMAT(elf32-littlearm) -OUTPUT_ARCH(arm) -STARTUP(target/arm/crt0-pp-bl.o) - -#define DRAMSIZE (MEMORYSIZE * 0x100000) - -#define DRAMORIG 0x10000000 -#define IRAMORIG 0x40000000 -#define IRAMSIZE 0x18000 -#define FLASHORIG 0x001f0000 -#define FLASHSIZE 2M - -MEMORY -{ - DRAM : ORIGIN = DRAMORIG, LENGTH = DRAMSIZE - IRAM : ORIGIN = IRAMORIG, LENGTH = IRAMSIZE -} - -SECTIONS -{ - . = IRAMORIG; - - .text : { - *(.init.text) - *(.text*) - *(.glue_7) - *(.glue_7t) - } > IRAM - - .data : { - *(.icode) - *(.irodata) - *(.idata) - *(.data*) - *(.ncdata*) - *(.rodata*) - _dataend = . ; - } > IRAM - - .stack (NOLOAD) : { - *(.stack) - _stackbegin = .; - stackbegin = .; - . += 0x2000; - _stackend = .; - stackend = .; - } > IRAM - - /* The bss section is too large for IRAM - we just move it 16MB into the - DRAM */ - - . = DRAMORIG; - .bss . + (16*1024*1024) (NOLOAD) : { - _edata = .; - *(.bss*); - *(.ibss); - *(COMMON) - *(.ncbss*); - _end = .; - } > DRAM -} +#include "../boot-pp502x-bl-usb.lds" diff --git a/firmware/target/arm/iriver/usb-target.h b/firmware/target/arm/iriver/usb-target.h index 03aa2cbff7..034b012bdd 100644 --- a/firmware/target/arm/iriver/usb-target.h +++ b/firmware/target/arm/iriver/usb-target.h @@ -24,6 +24,10 @@ #ifndef USB_TARGET_H #define USB_TARGET_H +#ifdef HAVE_BOOTLOADER_USB_MODE +#define USB_DRIVER_CLOSE +#endif + bool usb_init_device(void); void usb_pin_init(void); /* Init the GPIO input only */ bool usb_plugged(void); /* Returns instantaneous state - always */ |