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>

diff --git a/common/Kconfig b/common/Kconfig
index 21eaa5e815f9b55c6a7d4cd8b9f7cddf66e06761..5e79b5422178770f18ba04477c71c3dea3aaf8e5 100644 (file)
--- 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 a3631de7493211fcdda5dbf5b947cdb13654baf6..23902dee89e70d7bf897e6ecc3d9280bfe12bf4b 100644 (file)
--- 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 76225ba8ffa9479c5030dcffee69cbf6d7c059c8..3914f699659fb5257e1681d774b8a544e6e2b2e0 100644 (file)
--- 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));
 
        /*