From 232ed3ca534708527a9515c7c41bc3542949525c Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Sat, 28 Oct 2017 00:22:27 -0400 Subject: arm: config: fix default console only to specify the device Since CONFIG_DEFAULT_CONSOLE is already started with "console=", the console argument in CONFIG_EXTRA_ENV_SETTINGS is expanded to "console=console=ttySAC1,115200n8" and this causes the wrong console device. #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" ... #define CONFIG_EXTRA_ENV_SETTINGS \ "console=" CONFIG_DEFAULT_CONSOLE Signed-off-by: Dongjin Kim Reviewed-by: Simon Glass --- include/configs/s5p_goni.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/configs/s5p_goni.h') diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d81a36e065..86835e735e 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -95,7 +95,7 @@ #define CONFIG_BOOTCOMMAND "run mmcboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ " ${console} ${meminfo}" @@ -145,7 +145,7 @@ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0"\ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "mmcdev=0\0" \ -- cgit