| Message ID | 20191007221951.1889661-2-paul.burton@mips.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [1/4] MIPS: cmdline: Remove CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND | expand |
On 10/8/19 12:20 AM, Paul Burton wrote: > CONFIG_MIPS_CMDLINE_DTB_EXTEND is not selected by any of our defconfigs, > so remove it to simplify the messy command line logic in arch_mem_init() > a little. > > Signed-off-by: Paul Burton <paul.burton@mips.com> > --- > > arch/mips/Kconfig | 4 ---- > arch/mips/kernel/setup.c | 7 ------- > 2 files changed, 11 deletions(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index ec922e6ff40b..736b691e7e5e 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -3028,10 +3028,6 @@ choice > depends on USE_OF > bool "Dtb kernel arguments if available" > > - config MIPS_CMDLINE_DTB_EXTEND > - depends on USE_OF > - bool "Extend dtb kernel arguments with bootloader arguments" > - > config MIPS_CMDLINE_FROM_BOOTLOADER > bool "Bootloader kernel arguments if available" > endchoice > diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c > index c2a09f082d88..273b26a81935 100644 > --- a/arch/mips/kernel/setup.c > +++ b/arch/mips/kernel/setup.c > @@ -540,7 +540,6 @@ static void __init check_kernel_sections_mem(void) > > #define USE_PROM_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER) > #define USE_DTB_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) > -#define EXTEND_WITH_PROM IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND) > > /* > * arch_mem_init - initialize memory management subsystem > @@ -588,12 +587,6 @@ static void __init arch_mem_init(char **cmdline_p) > (USE_DTB_CMDLINE && !boot_command_line[0])) > strlcpy(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE); > > - if (EXTEND_WITH_PROM && arcs_cmdline[0]) { > - if (boot_command_line[0]) > - strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); > - strlcat(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE); > - } > - > #if defined(CONFIG_CMDLINE_BOOL) > if (builtin_cmdline[0]) { > if (boot_command_line[0]) > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ec922e6ff40b..736b691e7e5e 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -3028,10 +3028,6 @@ choice depends on USE_OF bool "Dtb kernel arguments if available" - config MIPS_CMDLINE_DTB_EXTEND - depends on USE_OF - bool "Extend dtb kernel arguments with bootloader arguments" - config MIPS_CMDLINE_FROM_BOOTLOADER bool "Bootloader kernel arguments if available" endchoice diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index c2a09f082d88..273b26a81935 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -540,7 +540,6 @@ static void __init check_kernel_sections_mem(void) #define USE_PROM_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER) #define USE_DTB_CMDLINE IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) -#define EXTEND_WITH_PROM IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND) /* * arch_mem_init - initialize memory management subsystem @@ -588,12 +587,6 @@ static void __init arch_mem_init(char **cmdline_p) (USE_DTB_CMDLINE && !boot_command_line[0])) strlcpy(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE); - if (EXTEND_WITH_PROM && arcs_cmdline[0]) { - if (boot_command_line[0]) - strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); - strlcat(boot_command_line, arcs_cmdline, COMMAND_LINE_SIZE); - } - #if defined(CONFIG_CMDLINE_BOOL) if (builtin_cmdline[0]) { if (boot_command_line[0])
CONFIG_MIPS_CMDLINE_DTB_EXTEND is not selected by any of our defconfigs, so remove it to simplify the messy command line logic in arch_mem_init() a little. Signed-off-by: Paul Burton <paul.burton@mips.com> --- arch/mips/Kconfig | 4 ---- arch/mips/kernel/setup.c | 7 ------- 2 files changed, 11 deletions(-)