Commit 2bcef9b4 authored by Jonas Gorski's avatar Jonas Gorski Committed by Ralf Baechle
Browse files

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: default avatarJonas 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2024972e

arch/mips/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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

arch/mips/bmips/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ void __init plat_mem_setup(void) 
		panic("no dtb found");



	__dt_setup_arch(dtb);

	strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);



	for (q = bmips_quirk_list; q->quirk_fn; q++) {

		if (of_flat_dt_is_compatible(of_get_flat_dt_root(),

arch/mips/lantiq/prom.c

+0 −2
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ void __init plat_mem_setup(void) 
	 * parsed resulting in our memory appearing

	 */

	__dt_setup_arch(__dtb_start);



	strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);

}



void __init device_tree_init(void)

arch/mips/netlogic/xlp/dt.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ void __init *xlp_dt_init(void *fdtp) 
void __init xlp_early_init_devtree(void)

{

	__dt_setup_arch(xlp_fdt_blob);

	strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);

}



void __init device_tree_init(void)

arch/mips/pistachio/init.c

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ void __init plat_mem_setup(void) 
		panic("Device-tree not present");



	__dt_setup_arch((void *)fw_arg1);

	strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);



	plat_setup_iocoherency();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE