summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <[email protected]>2019-04-08 13:20:44 -0600
committerSimon Glass <[email protected]>2019-04-23 20:26:43 -0600
commita1396cdc4b557ac678b7af93938e58814612759a (patch)
tree7bc62c0be0ca194c5ca2a1f39dbeef5096d67093
parent5dbe794dc0b2cceb76c2042b6806a342e7c4ca7f (diff)
sandbox: Move pre-console buffer out of the way of tracing
These two buffers currently conflict if tracing is enabled. Move the pre-console buffer and update the documentation. Signed-off-by: Simon Glass <[email protected]>
-rw-r--r--board/sandbox/README.sandbox3
-rw-r--r--configs/sandbox_defconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/board/sandbox/README.sandbox b/board/sandbox/README.sandbox
index ed8fac6f786..48c1e2b9e7b 100644
--- a/board/sandbox/README.sandbox
+++ b/board/sandbox/README.sandbox
@@ -477,6 +477,9 @@ that are mapped into that memory:
0 CONFIG_SYS_FDT_LOAD_ADDR Device tree
e000 CONFIG_BLOBLIST_ADDR Blob list
10000 CONFIG_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)
+=
--
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index bb508a8d02e..ba28db6d268 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -16,7 +16,7 @@ CONFIG_CONSOLE_RECORD=y
CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
CONFIG_SILENT_CONSOLE=y
CONFIG_PRE_CONSOLE_BUFFER=y
-CONFIG_PRE_CON_BUF_ADDR=0x100000
+CONFIG_PRE_CON_BUF_ADDR=0xf0000
CONFIG_LOG_MAX_LEVEL=6
CONFIG_LOG_ERROR_RETURN=y
CONFIG_DISPLAY_BOARDINFO_LATE=y