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 <linus.walleij@linaro.org>
(cherry picked from commit ea44ed5f388aecb6f745f7dd9b7df00748f7785f)

diff --git a/target/linux/gemini/config-4.14 b/target/linux/gemini/config-4.14
index c049200fe0310a60cfe5eb425ad9f2fd2d9c726e..6904ab9f696cb2146cb0918a0a3ec9f3c2508d95 100644 (file)
--- 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 ee2382a2ec8ac314634c7d9cac8319844d919e4d..055e7a4b49593abde232a3145d12f4f875f40c5e 100644 (file)
--- 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