From: Dongjin Kim Date: Sat, 28 Oct 2017 04:22:27 +0000 (-0400) Subject: [PATCH] arm: config: fix default console only to specify the device X-Git-Tag: archive/raspbian/2021.01+dfsg-4+rpi1~1^2^2^2^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af7f57b930fa8eb6d53017a7cadfa3c47ebbac11;p=u-boot.git [PATCH] arm: config: fix default console only to specify the device This reverts commit 767edf0f6b3eaa0303f3fd6afdc14ddce0aca70c and restores commit 232ed3ca534708527a9515c7c41bc3542949525c. Debian's flash-kernel expect the console variable to just contain the device, because it will set the bootargs to "console=${console}". So revert adding "console=" to the console parameter, but also adjust the shipped bootscripts for exynos boards to cope with it. Bug-Debian: https://bugs.debian.org/920116 Signed-off-by: Benjamin Drung Gbp-Pq: Topic exynos Gbp-Pq: Name 0001-arm-config-fix-default-console-only-to-specify-the-d.patch --- diff --git a/board/samsung/common/bootscripts/autoboot.cmd b/board/samsung/common/bootscripts/autoboot.cmd index d66bcccf5..f4ca05d7a 100644 --- a/board/samsung/common/bootscripts/autoboot.cmd +++ b/board/samsung/common/bootscripts/autoboot.cmd @@ -12,7 +12,7 @@ setenv initrdaddr "42000000" setenv loaddtb "load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} ${fdtfile}" setenv loadinitrd "load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} ${initrdname}" setenv loadkernel "load mmc ${mmcbootdev}:${mmcbootpart} '${kerneladdr}' '${kernelname}'" -setenv kernel_args "setenv bootargs ${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}" +setenv kernel_args "setenv bootargs console=${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}" #### Routine: check_dtb - check that target.dtb exists on boot partition setenv check_dtb " diff --git a/board/samsung/common/bootscripts/bootzimg.cmd b/board/samsung/common/bootscripts/bootzimg.cmd index 2fb4c163a..ea4bec476 100644 --- a/board/samsung/common/bootscripts/bootzimg.cmd +++ b/board/samsung/common/bootscripts/bootzimg.cmd @@ -1,5 +1,5 @@ setenv kernelname zImage; -setenv boot_kernel "setenv bootargs \"${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}\"; +setenv boot_kernel "setenv bootargs \"console=${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}\"; load mmc ${mmcbootdev}:${mmcbootpart} 0x40007FC0 '${kernelname}'; if load mmc ${mmcbootdev}:${mmcbootpart} 40800000 ${fdtfile}; then bootz 0x40007FC0 - 40800000; @@ -7,4 +7,4 @@ else echo Warning! Booting without DTB: '${fdtfile}'!; bootz 0x40007FC0 -; fi;" -run boot_kernel; \ No newline at end of file +run boot_kernel; diff --git a/board/samsung/common/dfu_sample_env.txt b/board/samsung/common/dfu_sample_env.txt index d6ee8a228..cbd788ec6 100644 --- a/board/samsung/common/dfu_sample_env.txt +++ b/board/samsung/common/dfu_sample_env.txt @@ -1,9 +1,9 @@ -mmcboot=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} ${rootfstype} rootwait ${console}; run loaduimage; bootm 0x40007FC0 +mmcboot=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} ${rootfstype} rootwait console=${console}; run loaduimage; bootm 0x40007FC0 rootfstype=ext4 loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage mmcdev=0 mmcbootpart=2 mmcrootpart=5 -console=console=ttySAC2,115200n8 +console=ttySAC2,115200n8 bootcmd=run mmcboot dfu_alt_info=u-boot mmc 80 800;params.bin mmc 0x38 0x8;uImage ext4 0 2 diff --git a/include/configs/odroid.h b/include/configs/odroid.h index befb9f9aa..fe722d85c 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -38,7 +38,7 @@ /* Console configuration */ #define CONFIG_BOOTCOMMAND "run distro_bootcmd ; 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) @@ -149,7 +149,7 @@ "elif test -e mmc ${mmcbootdev} 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 564319c23..6f752275f 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -25,7 +25,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 @@ -97,7 +97,7 @@ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV \ "rootfstype=ext4\0" \ - "console=" CONFIG_DEFAULT_CONSOLE \ + "console=" CONFIG_DEFAULT_CONSOLE "\0"\ "fdtfile=exynos5422-odroidxu3.dtb\0" \ "board_name=odroidxu3\0" \ "mmcbootdev=0\0" \ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index d6d07a95b..e5c2fd79d 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -85,7 +85,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}" @@ -131,7 +131,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 da6ed975c..755e7f4bd 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -27,7 +27,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) @@ -102,7 +102,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 3202627a7..d3d55ae08 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -34,7 +34,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) @@ -112,7 +112,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 14549dd1a..628557766 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -32,7 +32,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) @@ -95,7 +95,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" \