From 57e4cc8261ca6f0b32e4da6922a8f52ef82c4dc6 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 28 Dec 2020 15:17:57 +0100 Subject: [PATCH] ipq806x: disable CONFIG_CMDLINE_OVERRIDE and ASRock G10 After device support for ASRock G10 was added in [1], several people reported broken ipq806x devices, with one or several of the following symptoms: - Device does not boot - Sysupgrade does not work - Serial console is broken The issues appears to be caused by the introduction of the symbol CONFIG_CMDLINE_OVERRIDE=y in [1]. This patch disables the corresponding symbol again and marks the ASRock as BROKEN, as it probably won't work properly without it. Further references: https://bugs.openwrt.org/index.php?do=details&task_id=3540 https://github.com/openwrt/openwrt/commit/98b86296e67dd2b467212fe1a577656e6d3725da#commitcomment-45455875 [1] 98b86296e67d ("ipq806x: add support for ASRock G10") Signed-off-by: Adrian Schmutzler --- target/linux/ipq806x/config-5.4 | 2 +- target/linux/ipq806x/image/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4 index e6160bd455..43d2356316 100644 --- a/target/linux/ipq806x/config-5.4 +++ b/target/linux/ipq806x/config-5.4 @@ -78,7 +78,7 @@ CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_QCOM=y CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE_OVERRIDE=y +# CONFIG_CMDLINE_OVERRIDE is not set CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_QCOM=y CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 80bfec5ad9..e1a50e752c 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -103,6 +103,7 @@ define Device/asrock_g10 KERNEL_SIZE := 5332k DEVICE_PACKAGES := kmod-i2c-gpio ath10k-firmware-qca99x0-ct IMAGE/nand-factory.bin := append-ubi | edimax-header RN67 + BROKEN := y endef TARGET_DEVICES += asrock_g10 -- 2.30.2