mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
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 <tobetter@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
48c7f77128
commit
232ed3ca53
6 changed files with 12 additions and 12 deletions
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
|
@ -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" \
|
||||
|
|
Loading…
Add table
Reference in a new issue