sandbox: Enable more console options

Enable the pre-console buffer, displaying the model and post-relocation
console announce on sandbox. Also add a model name to the device tree.
This allows testing of these features.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Stephen Warren <swarren@nvidia.com>

diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index 40f423da2560920c443d7b193cb432d96ae1d7de..0aba6c9a6da6f17f6ecb912edb07a0eaf69d0d27 100644 (file)
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -5,6 +5,7 @@
 / {
        #address-cells = <1>;
        #size-cells = <1>;
+       model = "sandbox";
 
        aliases {
                eth5 = "/eth@90000000";

diff --git a/common/Kconfig b/common/Kconfig
index 086b6769376b15661df9afb4f747028d1bee0a0a..361346b092946e1ecb7f46768b73a692d07a2904 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -488,7 +488,7 @@ config DISPLAY_CPUINFO
 
 config DISPLAY_BOARDINFO
        bool "Display information about the board during start up"
-       default y if ARM || M68K || MIPS || PPC || XTENSA
+       default y if ARM || M68K || MIPS || PPC || SANDBOX || XTENSA
        help
          Display information about the board that U-Boot is running on
          when U-Boot starts up. The board function checkboard() is called

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 6a6e7741d8f6978f7e0805c38e1a284a8b3b0acc..7a1b9ef05282da0b76a43e2fc1a5741d2ac75342 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -14,6 +14,8 @@ CONFIG_BOOTSTAGE_STASH_SIZE=0x4096
 CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
 CONFIG_SILENT_CONSOLE=y
+CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_PRE_CON_BUF_ADDR=0
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
 CONFIG_CMD_BOOTZ=y

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 9276cf9734c6af7273b9998fe55dcb383d5f90e7..1e8404cbdf2720c99f3eabe146723629ee75f5e5 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -41,6 +41,7 @@
 
 #define CONFIG_SYS_LONGHELP                    /* #undef to save memory */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
+#define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)