[openwrt/openwrt] ipq806x: reenable CONFIG_CMDLINE_OVERRIDE and ASRock G10

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ac25b64350ef2b40bf975e617a3a1b33959a697e

commit ac25b64350ef2b40bf975e617a3a1b33959a697e
Author: Pawel Dembicki <paweldembicki at gmail.com>
AuthorDate: Thu Dec 31 16:53:24 2020 +0100

    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 at gmail.com>
    Tested-by: Hannu Nyman <hannu.nyman at iki.fi> (run-tested for R7800)
---
 target/linux/ipq806x/config-5.4     | 2 +-
 target/linux/ipq806x/image/Makefile | 1 -
 2 files changed, 1 insertion(+), 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