diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-02-28 16:00:33 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-11 11:15:56 -0500 |
commit | 603412f44755ffb7005bd54e16c46a1fd398a6ac (patch) | |
tree | 781af9eee0ce52bb9289e2afd773e269755bbca2 /firmware/target/mips | |
parent | cdee5284d46c913859bcb105bf3ea86bcbd6014f (diff) | |
download | rockbox-603412f44755ffb7005bd54e16c46a1fd398a6ac.tar.gz rockbox-603412f44755ffb7005bd54e16c46a1fd398a6ac.zip |
x1000: Clarify definition & usage of RAM areas
Document what the symbols are supposed to mean, fixup SPL's
usage of DRAM_END which should really be SDRAM_END instead.
No functional changes.
Change-Id: Ie85b0ee35fea8b7858891e5b9d6634eaae42c9f8
Diffstat (limited to 'firmware/target/mips')
-rw-r--r-- | firmware/target/mips/ingenic_x1000/spl-x1000.c | 2 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_x1000/spl.lds | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/firmware/target/mips/ingenic_x1000/spl-x1000.c b/firmware/target/mips/ingenic_x1000/spl-x1000.c index afaf5a7dd6..499b46ce62 100644 --- a/firmware/target/mips/ingenic_x1000/spl-x1000.c +++ b/firmware/target/mips/ingenic_x1000/spl-x1000.c | |||
@@ -432,7 +432,7 @@ void spl_main(void) | |||
432 | /* handle compression */ | 432 | /* handle compression */ |
433 | switch(opt->flags & BOOTFLAG_COMPRESSED) { | 433 | switch(opt->flags & BOOTFLAG_COMPRESSED) { |
434 | case BOOTFLAG_UCLPACK: { | 434 | case BOOTFLAG_UCLPACK: { |
435 | uint32_t out_size = X1000_DRAM_END - opt->load_addr; | 435 | uint32_t out_size = X1000_SDRAM_END - opt->load_addr; |
436 | rc = ucl_unpack((uint8_t*)load_buffer, opt->storage_size, | 436 | rc = ucl_unpack((uint8_t*)load_buffer, opt->storage_size, |
437 | (uint8_t*)opt->load_addr, &out_size); | 437 | (uint8_t*)opt->load_addr, &out_size); |
438 | } break; | 438 | } break; |
diff --git a/firmware/target/mips/ingenic_x1000/spl.lds b/firmware/target/mips/ingenic_x1000/spl.lds index b0169ab1aa..09ab75d520 100644 --- a/firmware/target/mips/ingenic_x1000/spl.lds +++ b/firmware/target/mips/ingenic_x1000/spl.lds | |||
@@ -7,10 +7,8 @@ ENTRY(_spl_start) | |||
7 | STARTUP(target/mips/ingenic_x1000/spl-start.o) | 7 | STARTUP(target/mips/ingenic_x1000/spl-start.o) |
8 | 8 | ||
9 | MEMORY { | 9 | MEMORY { |
10 | /* First 4k of TCSM is used by mask ROM for stack + variables, | 10 | TCSM : ORIGIN = X1000_SPL_EXEC_ADDR, |
11 | * and the next 2k are occupied by SPL header */ | 11 | LENGTH = X1000_SPL_SIZE |
12 | TCSM : ORIGIN = X1000_TCSM_BASE + 0x1800, | ||
13 | LENGTH = X1000_TCSM_SIZE - 0x1800 | ||
14 | } | 12 | } |
15 | 13 | ||
16 | SECTIONS | 14 | SECTIONS |