summaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-10-12 13:13:03 +0200
committerRalf Baechle <ralf@linux-mips.org>2015-11-11 08:38:37 +0100
commit2bcef9b457bbe159a5e3843e2578d8195e0b1c56 (patch)
tree6929a61bd517d5635812210fa2142be3314d0622 /arch/mips/Kconfig
parent2024972ef5330dcae47f400c586764d8f4cb0b04 (diff)
downloadlinux-2bcef9b457bbe159a5e3843e2578d8195e0b1c56.tar.gz
linux-2bcef9b457bbe159a5e3843e2578d8195e0b1c56.tar.bz2
linux-2bcef9b457bbe159a5e3843e2578d8195e0b1c56.zip
MIPS: Make MIPS_CMDLINE_DTB default
Seval of-enabled machines (bmips, lantiq, xlp, pistachio, ralink) copied the arguments from dtb to arcs_command_line to prevent the kernel from overwriting them. Since there is now an option to keep the dtb arguments, default to the new option remove the "backup" to arcs_command_line in case of USE_OF is enabled, except for those platforms that still take the bootloader arguments or do not use any at all. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: linux-mips@linux-mips.org Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: John Crispin <blogic@openwrt.org> Cc: Ganesan Ramalingam <ganesanr@broadcom.com> Cc: Jayachandran C <jchandra@broadcom.com> Cc: Andrew Bresticker <abrestic@chromium.org> Cc: James Hartley <james.hartley@imgtec.com> Patchwork: https://patchwork.linux-mips.org/patch/11285/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e3e65ae681c8..a65341a03712 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2751,6 +2751,9 @@ endchoice
choice
prompt "Kernel command line type" if !CMDLINE_OVERRIDE
+ default MIPS_CMDLINE_FROM_DTB if USE_OF && !ATH79 && !MACH_INGENIC && \
+ !MIPS_MALTA && !MIPS_SEAD3 && \
+ !CAVIUM_OCTEON_SOC
default MIPS_CMDLINE_FROM_BOOTLOADER
config MIPS_CMDLINE_FROM_DTB