sandbox: remap memory load addresses

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>

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 4c169034d9a28d3a5fe1df92e438604caeef7328..d61a327f151ae1ebdc117eeb68edbe016aa46baa 100644 (file)
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -77,7 +77,7 @@ config SANDBOX_BITS_PER_LONG
 
 config SYS_FDT_LOAD_ADDR
        hex "Address at which to load devicetree"
-       default 0x100
+       default 0x1000
        help
          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

diff --git a/common/Kconfig b/common/Kconfig
index 7685914fa6fd4ff736b0b205ca419829bf51664b..cf4bee063ae6a68db34df71226a3254b6d979451 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1070,7 +1070,7 @@ endchoice
 
 config BLOBLIST_ADDR
        hex "Address of bloblist"
-       default 0xb000 if SANDBOX
+       default 0x100 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 a8b0d7f0395832868df9ee101aa44e099873acf7..7e641306da2c1541490c185fdf66506f5e11085e 100644 (file)
--- a/doc/arch/sandbox/sandbox.rst
+++ b/doc/arch/sandbox/sandbox.rst
@@ -658,10 +658,10 @@ that are mapped into that memory:
 ========   ========================   ===============================
 Addr       Config                     Usage
 ========   ========================   ===============================
-     100   CONFIG_SYS_FDT_LOAD_ADDR   Device tree
-    b000   CONFIG_BLOBLIST_ADDR       Blob list
-   10000   CFG_MALLOC_F_ADDR          Early memory allocation
+     100   CONFIG_BLOBLIST_ADDR       Blob list
+    1000   CONFIG_SYS_FDT_LOAD_ADDR   Device tree
    f0000   CONFIG_PRE_CON_BUF_ADDR    Pre-console buffer
+   f4000   CFG_MALLOC_F_ADDR          Early memory allocation
   100000   TCG Event log              TCG Event Log
   200000   CONFIG_TRACE_EARLY_ADDR    Early trace buffer (if enabled). Also used
   400000   CONFIG_TEXT_BASE           Load buffer for U-Boot (sandbox_spl only)

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 2372485c84e9afdb5eac159e0f3e04edbb4557e4..db2ac7f83bb1858c7995494c8b59a847b0716a78 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CFG_MALLOC_F_ADDR              0x0010000
+#define CFG_MALLOC_F_ADDR              0x000f4000
 
 /* Size of our emulated memory */
 #define SB_CONCAT(x, y) x ## y

diff --git a/test/lib/kconfig.c b/test/lib/kconfig.c
index a3645abf9464785461c7250260c816e6bca03193..2f47af9acf1f4256534091e6ef7fd7b79d22ceb8 100644 (file)
--- a/test/lib/kconfig.c
+++ b/test/lib/kconfig.c
@@ -22,10 +22,10 @@ static int lib_test_is_enabled(struct unit_test_state *uts)
        ut_asserteq(0, CONFIG_IS_ENABLED(_UNDEFINED));
 
        if (IS_ENABLED(CONFIG_BLOBLIST)) {
-               ut_asserteq(0xb000, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
-                                                  CONFIG_BLOBLIST_ADDR));
-               ut_asserteq(0xb000, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED,
-                                                         BLOBLIST_ADDR));
+               ut_asserteq(0x100, IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
+                                                 CONFIG_BLOBLIST_ADDR));
+               ut_asserteq(0x100, CONFIG_IF_ENABLED_INT(BLOBLIST_FIXED,
+                                                        BLOBLIST_ADDR));
        }
 
        /*