|
@@ -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
|