From 603412f44755ffb7005bd54e16c46a1fd398a6ac Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Mon, 28 Feb 2022 16:00:33 +0000 Subject: 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 --- firmware/target/mips/ingenic_x1000/spl-x1000.c | 2 +- firmware/target/mips/ingenic_x1000/spl.lds | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'firmware/target') 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) /* handle compression */ switch(opt->flags & BOOTFLAG_COMPRESSED) { case BOOTFLAG_UCLPACK: { - uint32_t out_size = X1000_DRAM_END - opt->load_addr; + uint32_t out_size = X1000_SDRAM_END - opt->load_addr; rc = ucl_unpack((uint8_t*)load_buffer, opt->storage_size, (uint8_t*)opt->load_addr, &out_size); } 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) STARTUP(target/mips/ingenic_x1000/spl-start.o) MEMORY { - /* First 4k of TCSM is used by mask ROM for stack + variables, - * and the next 2k are occupied by SPL header */ - TCSM : ORIGIN = X1000_TCSM_BASE + 0x1800, - LENGTH = X1000_TCSM_SIZE - 0x1800 + TCSM : ORIGIN = X1000_SPL_EXEC_ADDR, + LENGTH = X1000_SPL_SIZE } SECTIONS -- cgit v1.2.3