mirror of
https://github.com/openwrt/openwrt.git
synced 2025-03-29 07:06:20 +00:00
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@iki.fi> Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com> Tested-by: Hannu Nyman <hannu.nyman@iki.fi> (run-tested for R7800) Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
parent
8702679d9b
commit
855ca155c9
@ -1,20 +1,20 @@
|
|||||||
--- a/arch/arm/Kconfig
|
--- a/arch/arm/Kconfig
|
||||||
+++ b/arch/arm/Kconfig
|
+++ b/arch/arm/Kconfig
|
||||||
@@ -1838,6 +1838,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
|
@@ -1840,6 +1840,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.
|
|
||||||
|
|
||||||
+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
|
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
|
config CMDLINE
|
||||||
|
string "Default kernel command string"
|
||||||
|
default ""
|
||||||
--- a/drivers/of/fdt.c
|
--- a/drivers/of/fdt.c
|
||||||
+++ b/drivers/of/fdt.c
|
+++ b/drivers/of/fdt.c
|
||||||
@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns
|
@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns
|
||||||
|
Loading…
x
Reference in New Issue
Block a user