On Sat, Sep 12, 2015 at 8:53 PM, Hauke Mehrtens <hauke@xxxxxxxxxx> wrote: > On 09/12/2015 06:26 PM, Jonas Gorski wrote: >> 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@xxxxxxxxxxx> >> --- >> arch/mips/Kconfig | 3 +++ >> arch/mips/bmips/setup.c | 1 - >> arch/mips/lantiq/prom.c | 2 -- >> arch/mips/netlogic/xlp/dt.c | 1 - >> arch/mips/pistachio/init.c | 1 - >> arch/mips/ralink/of.c | 2 -- >> 6 files changed, 3 insertions(+), 7 deletions(-) >> >> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig >> index 3753437..703142b 100644 >> --- a/arch/mips/Kconfig >> +++ b/arch/mips/Kconfig >> @@ -2730,6 +2730,9 @@ endchoice >> >> choice >> prompt "Kernel command line type" if !CMDLINE_OVERRIDE >> + default MIPS_CMDLINE_FROM_DTB if USE_OF && !ATh79 && !MACH_INGENIC && \ > > ATh79 does not exist, ATH79 does. Indeed. Maybe I should learn to use the caps-lock key ;). Will fix it for v2. Jonas
