diff options
author | James Buren <braewoods+rb@braewoods.net> | 2020-10-26 00:56:50 +0000 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-26 01:07:14 +0000 |
commit | bde72efa30218d6467f07cd0b0a223899484d640 (patch) | |
tree | 447494f132241370c146dadd8c4c1f937acb57a5 /firmware | |
parent | 129001909d36161b4850142f29eeafc295b92a3e (diff) | |
download | rockbox-bde72efa30218d6467f07cd0b0a223899484d640.tar.gz rockbox-bde72efa30218d6467f07cd0b0a223899484d640.zip |
coldfire: make the RAM and ROM image locations configurable by macros
Change-Id: Ie27e39c34947b0391be621dafb8711c44e863a1c
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config/iaudiom3.h | 3 | ||||
-rw-r--r-- | firmware/export/config/iaudiom5.h | 3 | ||||
-rw-r--r-- | firmware/export/config/iaudiox5.h | 3 | ||||
-rw-r--r-- | firmware/export/config/mpiohd200.h | 3 | ||||
-rw-r--r-- | firmware/export/config/mpiohd300.h | 3 | ||||
-rw-r--r-- | firmware/target/coldfire/crt0.S | 10 |
6 files changed, 15 insertions, 10 deletions
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h index 1ed31b4d46..cfac0d7253 100644 --- a/firmware/export/config/iaudiom3.h +++ b/firmware/export/config/iaudiom3.h | |||
@@ -158,7 +158,8 @@ | |||
158 | #define BOOTDIR "/.rockbox" | 158 | #define BOOTDIR "/.rockbox" |
159 | 159 | ||
160 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 | 160 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 |
161 | #define FLASH_ENTRYPOINT 0x00001000 | 161 | #define FLASH_RAMIMAGE_ENTRY 0x00001000 |
162 | #define FLASH_ROMIMAGE_ENTRY 0x00100000 | ||
162 | #define FLASH_MAGIC 0xfbfbfbf1 | 163 | #define FLASH_MAGIC 0xfbfbfbf1 |
163 | 164 | ||
164 | /* Define this for FM radio input available */ | 165 | /* Define this for FM radio input available */ |
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h index a90b0f061b..e7b46868b7 100644 --- a/firmware/export/config/iaudiom5.h +++ b/firmware/export/config/iaudiom5.h | |||
@@ -179,7 +179,8 @@ | |||
179 | #define BOOTDIR "/.rockbox" | 179 | #define BOOTDIR "/.rockbox" |
180 | 180 | ||
181 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 | 181 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 |
182 | #define FLASH_ENTRYPOINT 0x00001000 | 182 | #define FLASH_RAMIMAGE_ENTRY 0x00001000 |
183 | #define FLASH_ROMIMAGE_ENTRY 0x00100000 | ||
183 | #define FLASH_MAGIC 0xfbfbfbf1 | 184 | #define FLASH_MAGIC 0xfbfbfbf1 |
184 | 185 | ||
185 | /** Port-specific settings **/ | 186 | /** Port-specific settings **/ |
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h index fc97f71813..0164cd20fa 100644 --- a/firmware/export/config/iaudiox5.h +++ b/firmware/export/config/iaudiox5.h | |||
@@ -190,7 +190,8 @@ | |||
190 | #define BOOTDIR "/.rockbox" | 190 | #define BOOTDIR "/.rockbox" |
191 | 191 | ||
192 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 | 192 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 |
193 | #define FLASH_ENTRYPOINT 0x00001000 | 193 | #define FLASH_RAMIMAGE_ENTRY 0x00001000 |
194 | #define FLASH_ROMIMAGE_ENTRY 0x00100000 | ||
194 | #define FLASH_MAGIC 0xfbfbfbf1 | 195 | #define FLASH_MAGIC 0xfbfbfbf1 |
195 | 196 | ||
196 | /* Define this for FM radio input available */ | 197 | /* Define this for FM radio input available */ |
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h index 1d367e4b20..a770183946 100644 --- a/firmware/export/config/mpiohd200.h +++ b/firmware/export/config/mpiohd200.h | |||
@@ -169,7 +169,8 @@ | |||
169 | #define BOOTDIR "/.rockbox" | 169 | #define BOOTDIR "/.rockbox" |
170 | 170 | ||
171 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 | 171 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 |
172 | #define FLASH_ENTRYPOINT 0x00001000 | 172 | #define FLASH_RAMIMAGE_ENTRY 0x00001000 |
173 | #define FLASH_ROMIMAGE_ENTRY 0x00100000 | ||
173 | #define FLASH_MAGIC 0xfbfbfbf1 | 174 | #define FLASH_MAGIC 0xfbfbfbf1 |
174 | 175 | ||
175 | #endif /* SIMULATOR */ | 176 | #endif /* SIMULATOR */ |
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h index fe17ec16b5..d5b2948cec 100644 --- a/firmware/export/config/mpiohd300.h +++ b/firmware/export/config/mpiohd300.h | |||
@@ -172,7 +172,8 @@ | |||
172 | #define BOOTDIR "/.rockbox" | 172 | #define BOOTDIR "/.rockbox" |
173 | 173 | ||
174 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 | 174 | #define BOOTLOADER_ENTRYPOINT 0x001F0000 |
175 | #define FLASH_ENTRYPOINT 0x00001000 | 175 | #define FLASH_RAMIMAGE_ENTRY 0x00001000 |
176 | #define FLASH_ROMIMAGE_ENTRY 0x00100000 | ||
176 | #define FLASH_MAGIC 0xfbfbfbf1 | 177 | #define FLASH_MAGIC 0xfbfbfbf1 |
177 | 178 | ||
178 | #endif /* SIMULATOR */ | 179 | #endif /* SIMULATOR */ |
diff --git a/firmware/target/coldfire/crt0.S b/firmware/target/coldfire/crt0.S index 34492ec853..7ea4c49dca 100644 --- a/firmware/target/coldfire/crt0.S +++ b/firmware/target/coldfire/crt0.S | |||
@@ -151,14 +151,14 @@ start: | |||
151 | 151 | ||
152 | #ifdef BOOTLOADER | 152 | #ifdef BOOTLOADER |
153 | /* Check if we have a Rockbox ROM image */ | 153 | /* Check if we have a Rockbox ROM image */ |
154 | lea 0x00100000,%a2 | 154 | lea FLASH_ROMIMAGE_ENTRY,%a2 |
155 | move.l (%a2),%d0 | 155 | move.l (%a2),%d0 |
156 | move.l #FLASH_MAGIC,%d1 | 156 | move.l #FLASH_MAGIC,%d1 |
157 | cmp.l %d0,%d1 | 157 | cmp.l %d0,%d1 |
158 | beq.b .imagefound | 158 | beq.b .imagefound |
159 | 159 | ||
160 | /* Check for RAM image */ | 160 | /* Check for RAM image */ |
161 | lea 0x00001000,%a2 | 161 | lea FLASH_RAMIMAGE_ENTRY,%a2 |
162 | move.l (%a2),%d0 | 162 | move.l (%a2),%d0 |
163 | move.l #FLASH_MAGIC,%d1 | 163 | move.l #FLASH_MAGIC,%d1 |
164 | cmp.l %d0,%d1 | 164 | cmp.l %d0,%d1 |
@@ -244,7 +244,7 @@ start: | |||
244 | 244 | ||
245 | /* Check if we have a Rockbox ROM image. For RAM image only cookie is | 245 | /* Check if we have a Rockbox ROM image. For RAM image only cookie is |
246 | not set at all. But we could support also RAM images loading. */ | 246 | not set at all. But we could support also RAM images loading. */ |
247 | lea 0x00100000,%a2 | 247 | lea FLASH_ROMIMAGE_ENTRY,%a2 |
248 | move.l (%a2),%d0 | 248 | move.l (%a2),%d0 |
249 | move.l #FLASH_MAGIC,%d1 | 249 | move.l #FLASH_MAGIC,%d1 |
250 | cmp.l %d0,%d1 | 250 | cmp.l %d0,%d1 |
@@ -261,9 +261,9 @@ start: | |||
261 | Clear the cookie and load the ROM image */ | 261 | Clear the cookie and load the ROM image */ |
262 | lea 0x10017ffc,%a2 | 262 | lea 0x10017ffc,%a2 |
263 | clr.l (%a2) | 263 | clr.l (%a2) |
264 | lea 0x00100028+4,%a2 | 264 | lea FLASH_ROMIMAGE_ENTRY+44,%a2 |
265 | move.l (%a2),%sp | 265 | move.l (%a2),%sp |
266 | lea 0x00100028+8,%a2 | 266 | lea FLASH_ROMIMAGE_ENTRY+48,%a2 |
267 | move.l (%a2),%d0 | 267 | move.l (%a2),%d0 |
268 | move.l %d0,%a2 | 268 | move.l %d0,%a2 |
269 | jmp (%a2) | 269 | jmp (%a2) |