summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2020-04-01 00:35:15 +0200
committerLokesh Vutla <lokeshvutla@ti.com>2020-05-11 10:16:49 +0530
commit07693ccb1574adecb9e87756339442955aeaf346 (patch)
tree97a62da194d7693d96893e5e55421ab7d77021fa
parentb5f7cf50179c8d77ab4ee7240d3479437c5725c1 (diff)
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>
-rw-r--r--configs/nokia_rx51_defconfig2
-rw-r--r--include/configs/nokia_rx51.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 13bb6d07b76..fc92c3affcb 100644
--- 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 dd3b8eaf578..a9a0b1c9988 100644
--- 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" \