From: Linus Walleij Date: Wed, 10 Jul 2019 17:46:12 +0000 (+0200) Subject: gemini: Stop enforcing command line X-Git-Tag: v19.07.0-rc1~295 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4d5a47d20612ec223fa3ae4883bb750a7280cc6b;p=openwrt%2Fopenwrt.git gemini: Stop enforcing command line The command line enforced by the kernel is harmful, we want to use the command line passed from the device tree. This is especially important for the SQ201, Teltonika RUT and WBD111 which has a console set to 115200n8 and not 19200n8 like all the others, so their consoles will be confusingly changing baudrate between boot loader and kernel. The setting in the device tree corresponds to what the boot loader is using. Signed-off-by: Linus Walleij (cherry picked from commit ea44ed5f388aecb6f745f7dd9b7df00748f7785f) --- diff --git a/target/linux/gemini/config-4.14 b/target/linux/gemini/config-4.14 index c049200fe0..6904ab9f69 100644 --- a/target/linux/gemini/config-4.14 +++ b/target/linux/gemini/config-4.14 @@ -55,8 +55,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="console=ttyS0,19200n8" -CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_GEMINI=y CONFIG_CONSOLE_TRANSLATIONS=y diff --git a/target/linux/gemini/config-4.19 b/target/linux/gemini/config-4.19 index ee2382a2ec..055e7a4b49 100644 --- a/target/linux/gemini/config-4.19 +++ b/target/linux/gemini/config-4.19 @@ -62,8 +62,6 @@ CONFIG_CMA_SIZE_MBYTES=16 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -CONFIG_CMDLINE="console=ttyS0,19200n8" -CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_GEMINI=y CONFIG_CONSOLE_TRANSLATIONS=y