Nokia RX-51: Enable CONFIG_CONSOLE_MUX

After this change both device display and serial console would contain
U-Boto output automatically without any future configuration. This would
allow easier debugging on real device as access to serial console is hard
and also in qemu emulator where it is easier to copy+paste from serial
console as from SDL framebuffer.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 13bb6d07b76ee787daf5bba6a41c17c6d470b0fc..fc92c3affcb1f181d0ed790df702bb415eff65a0 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -7,7 +7,7 @@ CONFIG_NR_DRAM_BANKS=2
 CONFIG_BOOTDELAY=30
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="run preboot"
-# CONFIG_CONSOLE_MUX is not set
+CONFIG_CONSOLE_MUX=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Nokia RX-51 # "

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index dd3b8eaf578141fce961b27e3212f3b26ca8a33a..a9a0b1c9988e5a3b95862a442a8f7bc391e8c313 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -119,9 +119,9 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 /* Environment information */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "usbtty=cdc_acm\0" \
-       "stdin=vga\0" \
-       "stdout=vga\0" \
-       "stderr=vga\0" \
+       "stdin=serial,vga\0" \
+       "stdout=serial,vga\0" \
+       "stderr=serial,vga\0" \
        "setcon=setenv stdin ${con};" \
                "setenv stdout ${con};" \
                "setenv stderr ${con}\0" \