Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 23:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sandbox: remap memory load addresses

Browse source 
The existing memory layout places the bloblist at 0xb000 and the fdt at
0x100, resulting in a 0xaf00 size constraint for the fdt. This constraint
has been reached. Lets modify the layout by moving the bloblist to 0x100,
device tree to 0x1000 and placing early memory allocation after pre-console
buffer at 0xf4000. This should guarantee sufficient memory allocation for
future expansion.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
This commit is contained in:
Svyatoslav Ryhel 2025-03-07 10:59:57 +02:00
parent 0fd7ee0306
commit e6883b6b30
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sandbox/Kconfig
View file

@ -77,7 +77,7 @@ config SANDBOX_BITS_PER_LONG
config SYS_FDT_LOAD_ADDR config SYS_FDT_LOAD_ADDR
hex "Address at which to load devicetree" hex "Address at which to load devicetree"
default 0x100 default 0x1000
help help
With sandbox the devicetree is loaded into the emulated RAM. This sets With sandbox the devicetree is loaded into the emulated RAM. This sets
the address that is used. There must be enough space at this address the address that is used. There must be enough space at this address

2
common/Kconfig
View file

@ -1070,7 +1070,7 @@ endchoice
config BLOBLIST_ADDR config BLOBLIST_ADDR
hex "Address of bloblist" hex "Address of bloblist"
default 0xb000 if SANDBOX default 0x100 if SANDBOX
depends on BLOBLIST_FIXED depends on BLOBLIST_FIXED
help help
Sets the address of the bloblist, set up by the first part of U-Boot Sets the address of the bloblist, set up by the first part of U-Boot

6
doc/arch/sandbox/sandbox.rst
View file

@ -658,10 +658,10 @@ that are mapped into that memory:
======== ======================== =============================== ======== ======================== ===============================
Addr Config Usage Addr Config Usage
======== ======================== =============================== ======== ======================== ===============================
100 CONFIG_SYS_FDT_LOAD_ADDR Device tree 100 CONFIG_BLOBLIST_ADDR Blob list
b000 CONFIG_BLOBLIST_ADDR Blob list 1000 CONFIG_SYS_FDT_LOAD_ADDR Device tree
10000 CFG_MALLOC_F_ADDR Early memory allocation
f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer
f4000 CFG_MALLOC_F_ADDR Early memory allocation
100000 TCG Event log TCG Event Log 100000 TCG Event log TCG Event Log
200000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used 200000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used
400000 CONFIG_TEXT_BASE Load buffer for U-Boot (sandbox_spl only) 400000 CONFIG_TEXT_BASE Load buffer for U-Boot (sandbox_spl only)

2
include/configs/sandbox.h
View file

@ -6,7 +6,7 @@
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
#define CFG_MALLOC_F_ADDR 0x0010000 #define CFG_MALLOC_F_ADDR 0x000f4000
/* Size of our emulated memory */ /* Size of our emulated memory */
#define SB_CONCAT(x, y) x ## y #define SB_CONCAT(x, y) x ## y

8
test/lib/kconfig.c
View file

@ -22,10 +22,10 @@ static int lib_test_is_enabled(struct unit_test_state *uts)
ut_asserteq(0, CONFIG_IS_ENABLED(_UNDEFINED)); ut_asserteq(0, CONFIG_IS_ENABLED(_UNDEFINED));
if (IS_ENABLED(CONFIG_BLOBLIST)) { if (IS_ENABLED(CONFIG_BLOBLIST)) {
ut_asserteq(0xb000, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED, ut_asserteq(0x100, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
CONFIG_BLOBLIST_ADDR)); CONFIG_BLOBLIST_ADDR));
ut_asserteq(0xb000, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED, ut_asserteq(0x100, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED,
BLOBLIST_ADDR)); BLOBLIST_ADDR));
} }
/* /*