diff options
author | Dave Chapman <dave@dchapman.com> | 2009-10-11 01:37:12 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2009-10-11 01:37:12 +0000 |
commit | b04a7a86e1d903a37091486764d0dfe09372d663 (patch) | |
tree | 35c74cc921eb641858269c30c2add4e436d97ec8 /firmware/target/arm/s5l8700 | |
parent | a27f2b8683204e337b142124979592ee1cd0d6f9 (diff) | |
download | rockbox-b04a7a86e1d903a37091486764d0dfe09372d663.tar.gz rockbox-b04a7a86e1d903a37091486764d0dfe09372d663.zip |
Make the Nano2G bootloader actually function as a bootloader. The resulting bootloader-ipodnano2g.ipod file needs to be encrypted on a target using the crypt_firmware plugin to create bootloader-ipodnano2g.ipodx, which can then be written to the firmware partition using the ipodpatcher patch at FS#10609. Dual-booting doesn't work yet - only Rockbox can be run.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23084 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s5l8700')
-rw-r--r-- | firmware/target/arm/s5l8700/boot.lds | 12 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/crt0.S | 21 | ||||
-rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h | 5 |
3 files changed, 33 insertions, 5 deletions
diff --git a/firmware/target/arm/s5l8700/boot.lds b/firmware/target/arm/s5l8700/boot.lds index 2dea0ee4ea..637a3a29c1 100644 --- a/firmware/target/arm/s5l8700/boot.lds +++ b/firmware/target/arm/s5l8700/boot.lds | |||
@@ -9,14 +9,14 @@ OUTPUT_FORMAT(elf32-bigarm) | |||
9 | OUTPUT_ARCH(arm) | 9 | OUTPUT_ARCH(arm) |
10 | STARTUP(target/arm/s5l8700/crt0.o) | 10 | STARTUP(target/arm/s5l8700/crt0.o) |
11 | 11 | ||
12 | /* DRAMORIG is in fact 0x08000000 but remapped to 0x0 */ | ||
13 | #define DRAMORIG 0x08000000 | 12 | #define DRAMORIG 0x08000000 |
14 | #define DRAMSIZE (MEMORYSIZE * 0x100000) | 13 | #define DRAMSIZE (MEMORYSIZE * 0x100000) |
15 | 14 | ||
16 | #define IRAMORIG 0x22000000 | ||
17 | #if CONFIG_CPU==S5L8701 | 15 | #if CONFIG_CPU==S5L8701 |
16 | #define IRAMORIG 0x0 | ||
18 | #define IRAMSIZE 176K | 17 | #define IRAMSIZE 176K |
19 | #else | 18 | #else |
19 | #define IRAMORIG 0x22000000 | ||
20 | #define IRAMSIZE 256K | 20 | #define IRAMSIZE 256K |
21 | #endif | 21 | #endif |
22 | 22 | ||
@@ -91,7 +91,11 @@ SECTIONS | |||
91 | _fiqstackend = .; | 91 | _fiqstackend = .; |
92 | } > IRAM | 92 | } > IRAM |
93 | 93 | ||
94 | .bss : { | 94 | /* The bss section is too large for IRAM - we just move it 12MB into the |
95 | DRAM */ | ||
96 | |||
97 | . = DRAMORIG; | ||
98 | .bss . + (12*1024*1024): { | ||
95 | _edata = .; | 99 | _edata = .; |
96 | *(.bss*); | 100 | *(.bss*); |
97 | *(.ibss); | 101 | *(.ibss); |
@@ -99,5 +103,5 @@ SECTIONS | |||
99 | *(COMMON); | 103 | *(COMMON); |
100 | . = ALIGN(0x4); | 104 | . = ALIGN(0x4); |
101 | _end = .; | 105 | _end = .; |
102 | } > IRAM | 106 | } > DRAM |
103 | } | 107 | } |
diff --git a/firmware/target/arm/s5l8700/crt0.S b/firmware/target/arm/s5l8700/crt0.S index 4a89f3da39..aa2923cb29 100644 --- a/firmware/target/arm/s5l8700/crt0.S +++ b/firmware/target/arm/s5l8700/crt0.S | |||
@@ -27,7 +27,11 @@ | |||
27 | .global _newstart | 27 | .global _newstart |
28 | /* Exception vectors */ | 28 | /* Exception vectors */ |
29 | start: | 29 | start: |
30 | #if CONFIG_CPU==S5L8701 && defined(BOOTLOADER) | ||
31 | b newstart2 | ||
32 | #else | ||
30 | b _newstart | 33 | b _newstart |
34 | #endif | ||
31 | ldr pc, =undef_instr_handler | 35 | ldr pc, =undef_instr_handler |
32 | ldr pc, =software_int_handler | 36 | ldr pc, =software_int_handler |
33 | ldr pc, =prefetch_abort_handler | 37 | ldr pc, =prefetch_abort_handler |
@@ -88,7 +92,22 @@ newstart2: | |||
88 | orr r2, r2, #1 | 92 | orr r2, r2, #1 |
89 | bic r2, r2, #0x10000 | 93 | bic r2, r2, #0x10000 |
90 | str r2, [r1] // remap iram to address 0x0 | 94 | str r2, [r1] // remap iram to address 0x0 |
91 | #endif | 95 | |
96 | #ifdef BOOTLOADER | ||
97 | /* Relocate ourself to IRAM - we have been loaded to DRAM */ | ||
98 | mov r0, #0x08000000 /* source (DRAM) */ | ||
99 | mov r1, #0x00000000 /* dest (IRAM) */ | ||
100 | ldr r2, =_dataend | ||
101 | 1: | ||
102 | cmp r2, r1 | ||
103 | ldrhi r3, [r0], #4 | ||
104 | strhi r3, [r1], #4 | ||
105 | bhi 1b | ||
106 | |||
107 | ldr pc, =start_loc /* jump to the relocated start_loc: */ | ||
108 | start_loc: | ||
109 | #endif /* BOOTLOADER */ | ||
110 | #endif /* CONFIG_CPU==S5L8701 */ | ||
92 | 111 | ||
93 | ldr r1, =0x3c500000 // CLKCON | 112 | ldr r1, =0x3c500000 // CLKCON |
94 | ldr r0, =0x00800080 | 113 | ldr r0, =0x00800080 |
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h b/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h index f214964551..0c36db9799 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h +++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-target.h | |||
@@ -25,6 +25,11 @@ | |||
25 | #include "config.h" | 25 | #include "config.h" |
26 | #include "inttypes.h" | 26 | #include "inttypes.h" |
27 | 27 | ||
28 | #ifdef BOOTLOADER | ||
29 | /* Bootloaders don't need write access */ | ||
30 | #define FTL_READONLY | ||
31 | #endif | ||
32 | |||
28 | uint32_t ftl_init(void); | 33 | uint32_t ftl_init(void); |
29 | uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer); | 34 | uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer); |
30 | uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer); | 35 | uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer); |