aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x
diff options
context:
space:
mode:
authorPawel Dembicki <paweldembicki@gmail.com>2020-12-31 16:53:24 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2021-01-01 22:10:20 +0100
commitac25b64350ef2b40bf975e617a3a1b33959a697e (patch)
treedfa34cbe527f3bbbe4e9d46fe61420a71cf65165 /target/linux/ipq806x
parent6230b235b229742bc92a317710ca8e6991b08f47 (diff)
downloadupstream-ac25b64350ef2b40bf975e617a3a1b33959a697e.tar.gz
upstream-ac25b64350ef2b40bf975e617a3a1b33959a697e.tar.bz2
upstream-ac25b64350ef2b40bf975e617a3a1b33959a697e.zip
ipq806x: reenable CONFIG_CMDLINE_OVERRIDE and ASRock G10
This reverts commit 57e4cc8261ca6f0b32e4da6922a8f52ef82c4dc6. Cmdline override patch was fixed. It's time for reenable Asrock G10 support. Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> Tested-by: Hannu Nyman <hannu.nyman@iki.fi> (run-tested for R7800)
Diffstat (limited to 'target/linux/ipq806x')
-rw-r--r--target/linux/ipq806x/config-5.42
-rw-r--r--target/linux/ipq806x/image/Makefile1
2 files changed, 1 insertions, 2 deletions
diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index 43d2356316..e6160bd455 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 is not set
+CONFIG_CMDLINE_OVERRIDE=y
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 e1a50e752c..80bfec5ad9 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -103,7 +103,6 @@ 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