diff options
| author | Simon Glass <sjg@chromium.org> | 2023-09-26 08:14:50 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-06 14:38:13 -0400 |
| commit | ff6c708b999aa8b713e7951b9195c8e743495d8b (patch) | |
| tree | fb64395373da406031eaa11b14fd0562b74e277f | |
| parent | 97192937bf0edaa4865bc13487ee35e913c6a2c5 (diff) | |
| download | u-boot-ff6c708b999aa8b713e7951b9195c8e743495d8b.tar.gz | |
sandbox: Move the bloblist down a little in memory
Move this down by 4KB so that it is large enough to hold the devicetree.
Also fix up the devicetree address in the documetation while we are here.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/Kconfig | 2 | ||||
| -rw-r--r-- | doc/arch/sandbox/sandbox.rst | 4 | ||||
| -rw-r--r-- | test/lib/kconfig.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/Kconfig b/common/Kconfig index 21eaa5e815f..5e79b542217 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1012,7 +1012,7 @@ endchoice config BLOBLIST_ADDR hex "Address of bloblist" - default 0xc000 if SANDBOX + default 0xb000 if SANDBOX depends on BLOBLIST_FIXED help Sets the address of the bloblist, set up by the first part of U-Boot diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst index a3631de7493..23902dee89e 100644 --- a/doc/arch/sandbox/sandbox.rst +++ b/doc/arch/sandbox/sandbox.rst @@ -614,8 +614,8 @@ that are mapped into that memory: ======= ======================== =============================== Addr Config Usage ======= ======================== =============================== - 0 CONFIG_SYS_FDT_LOAD_ADDR Device tree - c000 CONFIG_BLOBLIST_ADDR Blob list + 100 CONFIG_SYS_FDT_LOAD_ADDR Device tree + b000 CONFIG_BLOBLIST_ADDR Blob list 10000 CFG_MALLOC_F_ADDR Early memory allocation f0000 CONFIG_PRE_CON_BUF_ADDR Pre-console buffer 100000 CONFIG_TRACE_EARLY_ADDR Early trace buffer (if enabled). Also used diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c index 76225ba8ffa..3914f699659 100644 --- a/test/lib/kconfig.c +++ b/test/lib/kconfig.c @@ -22,9 +22,9 @@ static int lib_test_is_enabled(struct unit_test_state *uts) ut_asserteq(0, CONFIG_IS_ENABLED(OF_PLATDATA)); ut_asserteq(0, CONFIG_IS_ENABLED(_UNDEFINED)); - ut_asserteq(0xc000, + ut_asserteq(0xb000, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED, CONFIG_BLOBLIST_ADDR)); - ut_asserteq(0xc000, + ut_asserteq(0xb000, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED, BLOBLIST_ADDR)); /* |