sandbox: move the TCG event log to the start of ram memory

The TCG event log buffer is being set at the end of ram memory. This
region of memory is to be reserved as LMB_NOMAP memory in the LMB
memory map. The current location of this buffer overlaps with the
memory region reserved for the U-Boot image, which is at the top of
the usable memory. This worked earlier as the LMB memory map was not
global but caller specific, but fails now because of the overlap.

Move the TCG event log buffer to the start of the ram memory region
instead. Move the location of the early trace buffer and the load
buffer for U-Boot(spl boot) accordingly.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 5fb5eac862ecf5fac4d366ed08f5e664fc615a82..8412506c17a638135b1011d5e59c3956017b5e96 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -78,7 +78,7 @@
 
                event_log: tcg_event_log {
                        no-map;
-                       reg = <(CFG_SYS_SDRAM_SIZE - 0x2000) 0x2000>;
+                       reg = <(CFG_SYS_SDRAM_BASE + 0x100000) 0x2000>;
                };
        };
 

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index f7b92dc844504d52799d16d16fcccad8bc0fa9dc..826a82d09211a353df752847f6bc71f42e1cb0dd 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -1,4 +1,4 @@
-CONFIG_TEXT_BASE=0x200000
+CONFIG_TEXT_BASE=0x400000
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

diff --git a/doc/arch/sandbox/sandbox.rst b/doc/arch/sandbox/sandbox.rst
index 5f8db126657fbbe0c15872e1333fbac6a22a8087..496755172469f36e092065170c8debbadc829d02 100644 (file)
--- a/doc/arch/sandbox/sandbox.rst
+++ b/doc/arch/sandbox/sandbox.rst
@@ -662,7 +662,8 @@ Addr      Config                     Usage
    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
+ 100000   TCG Event log              TCG Event Log
+ 200000   CONFIG_TRACE_EARLY_ADDR    Early trace buffer (if enabled). Also used
                                      as the SPL load buffer in spl_test_load().
- 200000   CONFIG_TEXT_BASE           Load buffer for U-Boot (sandbox_spl only)
+ 400000   CONFIG_TEXT_BASE           Load buffer for U-Boot (sandbox_spl only)
 =======   ========================   ===============================

diff --git a/lib/Kconfig b/lib/Kconfig
index e352b5550a2104fb1d6d621a2d805b63cd1807de..5f282ecb543e6fb266152d2d0331da4c4122aac7 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -403,7 +403,7 @@ config TRACE_EARLY_CALL_DEPTH_LIMIT
 config TRACE_EARLY_ADDR
        hex "Address of early trace buffer in U-Boot"
        depends on TRACE_EARLY
-       default 0x00100000
+       default 0x00200000
        help
          Sets the address of the early trace buffer in U-Boot. This memory
          must be accessible before relocation.