[openwrt/openwrt] ipq806x: fix 900-arm-add-cmdline-override.patch

[LEDE Commits]

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

commit 6230b235b229742bc92a317710ca8e6991b08f47
Author: Pawel Dembicki <paweldembicki at gmail.com>
AuthorDate: Thu Dec 31 16:51:15 2020 +0100

    ipq806x: fix 900-arm-add-cmdline-override.patch
    
    900-arm-add-cmdline-override.patch have missplaced entry in
    arch/arm/Kconfig file. It causes problem with other cmdline
    patches. This patch put Kconfig entry in correct place.
    
    Fixes: 98b86296e67d ("ipq806x: add support for ASRock G10")
    
    Suggested-by: Hannu Nyman <hannu.nyman at iki.fi>
    Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
    Tested-by: Hannu Nyman <hannu.nyman at iki.fi> (run-tested for R7800)
---
 .../patches-5.4/900-arm-add-cmdline-override.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch
index 60b160ae62..49cd68b68d 100644
--- a/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch
+++ b/target/linux/ipq806x/patches-5.4/900-arm-add-cmdline-override.patch
@@ -1,20 +1,20 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1838,6 +1838,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
- 	  Only command line ATAG will be processed, the rest of the ATAGs
- 	  sent by bootloader will be ignored.
+@@ -1840,6 +1840,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
  
-+config CMDLINE_OVERRIDE
-+    bool "Use alternative cmdline from device tree"
-+    help
-+      Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can
-+      be used, this is not a good option for kernels that are shared across
-+      devices. This setting enables using "chosen/cmdline-override" as the
-+      cmdline if it exists in the device tree.
-+
  endchoice
  
++config CMDLINE_OVERRIDE
++	bool "Use alternative cmdline from device tree"
++	help
++	  Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can
++	  be used, this is not a good option for kernels that are shared across
++	  devices. This setting enables using "chosen/cmdline-override" as the
++	  cmdline if it exists in the device tree.
++
  config CMDLINE
+ 	string "Default kernel command string"
+ 	default ""
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
 @@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns