From 232ed3ca534708527a9515c7c41bc3542949525c Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Sat, 28 Oct 2017 00:22:27 -0400 Subject: [PATCH] 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/odroid.h | 4 ++-- include/configs/odroid_xu3.h | 4 ++-- include/configs/s5p_goni.h | 4 ++-- include/configs/s5pc210_universal.h | 4 ++-- include/configs/trats.h | 4 ++-- include/configs/trats2.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 22e9c82..60ed013 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -44,7 +44,7 @@ /* Console configuration */ #define CONFIG_BOOTCOMMAND "run autoboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) @@ -158,7 +158,7 @@ "elif test -e mmc 0 uImage; then; " \ "run boot_uimg;" \ "fi;\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0" \ "mmcbootdev=0\0" \ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 13a4501..2969f18 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -34,7 +34,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" /* USB */ #define CONFIG_USB_EHCI_EXYNOS @@ -108,7 +108,7 @@ BOOTENV \ "bootdelay=0\0" \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0"\ "fdtfile=exynos5422-odroidxu3.dtb\0" \ "boardname=odroidxu3\0" \ "mmcbootdev=0\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d81a36e..86835e7 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" \ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 2b71c5e..b0bcc56 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -30,7 +30,7 @@ /* Console configuration */ #define CONFIG_BOOTCOMMAND "run mmcboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) @@ -119,7 +119,7 @@ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "mbrparts=" MBRPARTS_DEFAULT \ "meminfo=crashkernel=32M@0x50000000\0" \ diff --git a/include/configs/trats.h b/include/configs/trats.h index a34c349..b97efc2 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -42,7 +42,7 @@ #define CONFIG_MACH_TYPE MACH_TYPE_TRATS #define CONFIG_BOOTCOMMAND "run autoboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) @@ -129,7 +129,7 @@ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0" \ "meminfo=crashkernel=32M@0x50000000\0" \ "nfsroot=/nfsroot/arm\0" \ "bootblock=" CONFIG_BOOTBLOCK "\0" \ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 6b371f4..871accf 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -39,7 +39,7 @@ /* Console configuration */ #define CONFIG_BOOTCOMMAND "run autoboot" -#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" +#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ - GENERATED_GBL_DATA_SIZE) @@ -111,7 +111,7 @@ "boottrace=setenv opts initcall_debug; run bootcmd\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0" \ "kernelname=uImage\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \ "${kernelname}\0" \