LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "arm: config: fix default console only to specify the device" 

This reverts commit 232ed3ca53.

In exynos boards, ${console} is used to set bootargs but it sets
without "console=", so CONFIG_DEFAULT_CONSOLE for these boards is
designated with "console=" but it is removed. So revert the commit.

References for using ${console} in
   board/samsung/common/bootscripts/autoboot.cmd
   board/samsung/common/bootscripts/bootzimg.cmd

Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Seung-Woo Kim 2018-11-20 14:54:39 +09:00 committed by Minkyu Kang
parent 9c15044ae4
commit 767edf0f6b
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/configs/odroid.h
View File

@ -40,7 +40,7 @@
/* Console configuration */ /* Console configuration */
#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot" #define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run autoboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -157,7 +157,7 @@
"elif test -e mmc 0 uImage; then; " \ "elif test -e mmc 0 uImage; then; " \
"run boot_uimg;" \ "run boot_uimg;" \
"fi;\0" \ "fi;\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"mmcbootdev=0\0" \ "mmcbootdev=0\0" \
"mmcbootpart=1\0" \ "mmcbootpart=1\0" \
"mmcrootdev=0\0" \ "mmcrootdev=0\0" \

4
include/configs/odroid_xu3.h
View File

@ -30,7 +30,7 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
/* USB */ /* USB */
#define CONFIG_USB_EHCI_EXYNOS #define CONFIG_USB_EHCI_EXYNOS
@ -100,7 +100,7 @@
MEM_LAYOUT_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \
BOOTENV \ BOOTENV \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0"\ "console=" CONFIG_DEFAULT_CONSOLE \
"fdtfile=exynos5422-odroidxu3.dtb\0" \ "fdtfile=exynos5422-odroidxu3.dtb\0" \
"boardname=odroidxu3\0" \ "boardname=odroidxu3\0" \
"mmcbootdev=0\0" \ "mmcbootdev=0\0" \

4
include/configs/s5p_goni.h
View File

@ -87,7 +87,7 @@
#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_BOOTCOMMAND "run mmcboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ #define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \
" ${console} ${meminfo}" " ${console} ${meminfo}"
@ -134,7 +134,7 @@
"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0"\ "console=" CONFIG_DEFAULT_CONSOLE \
"meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \

4
include/configs/s5pc210_universal.h
View File

@ -27,7 +27,7 @@
/* Console configuration */ /* Console configuration */
#define CONFIG_BOOTCOMMAND "run mmcboot" #define CONFIG_BOOTCOMMAND "run mmcboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC1,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -108,7 +108,7 @@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT \
"mbrparts=" MBRPARTS_DEFAULT \ "mbrparts=" MBRPARTS_DEFAULT \
"meminfo=crashkernel=32M@0x50000000\0" \ "meminfo=crashkernel=32M@0x50000000\0" \

4
include/configs/trats.h
View File

@ -36,7 +36,7 @@
#define CONFIG_MACH_TYPE MACH_TYPE_TRATS #define CONFIG_MACH_TYPE MACH_TYPE_TRATS
#define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_BOOTCOMMAND "run autoboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -120,7 +120,7 @@
"mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"meminfo=crashkernel=32M@0x50000000\0" \ "meminfo=crashkernel=32M@0x50000000\0" \
"nfsroot=/nfsroot/arm\0" \ "nfsroot=/nfsroot/arm\0" \
"bootblock=" CONFIG_BOOTBLOCK "\0" \ "bootblock=" CONFIG_BOOTBLOCK "\0" \

4
include/configs/trats2.h
View File

@ -34,7 +34,7 @@
/* Console configuration */ /* Console configuration */
#define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_BOOTCOMMAND "run autoboot"
#define CONFIG_DEFAULT_CONSOLE "ttySAC2,115200n8" #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0"
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
- GENERATED_GBL_DATA_SIZE) - GENERATED_GBL_DATA_SIZE)
@ -103,7 +103,7 @@
"boottrace=setenv opts initcall_debug; run bootcmd\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \
"verify=n\0" \ "verify=n\0" \
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE "\0" \ "console=" CONFIG_DEFAULT_CONSOLE \
"kernelname=uImage\0" \ "kernelname=uImage\0" \
"loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 " \
"${kernelname}\0" \ "${kernelname}\0" \