linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/4] MIPS: cmdline: Remove CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND
@ 2019-10-07 22:20 Paul Burton
  2019-10-07 22:20 ` [PATCH 3/4] MIPS: cmdline: Remove redundant Kconfig defaults Paul Burton
                   ` (4 more replies)
  0 siblings, 5 replies; 11+ messages in thread
From: Paul Burton @ 2019-10-07 22:20 UTC (permalink / raw)
  To: linux-mips; +Cc: Paul Burton

CONFIG_MIPS_CMDLINE_BUILTIN_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 | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a0bd9bdb5f83..ec922e6ff40b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3034,10 +3034,6 @@ choice
 
 	config MIPS_CMDLINE_FROM_BOOTLOADER
 		bool "Bootloader kernel arguments if available"
-
-	config MIPS_CMDLINE_BUILTIN_EXTEND
-		depends on CMDLINE_BOOL
-		bool "Extend builtin kernel arguments with bootloader arguments"
 endchoice
 
 endmenu
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 5eec13b8d222..c2a09f082d88 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -541,8 +541,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)
-#define BUILTIN_EXTEND_WITH_PROM	\
-	IS_ENABLED(CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND)
 
 /*
  * arch_mem_init - initialize memory management subsystem
@@ -602,12 +600,6 @@ static void __init arch_mem_init(char **cmdline_p)
 			strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);
 		strlcat(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
 	}
-
-	if (BUILTIN_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);
-	}
 #endif
 #endif
 	strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2019-10-09 22:53 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-07 22:20 [PATCH 1/4] MIPS: cmdline: Remove CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND Paul Burton
2019-10-07 22:20 ` [PATCH 3/4] MIPS: cmdline: Remove redundant Kconfig defaults Paul Burton
2019-10-09 12:20   ` Philippe Mathieu-Daudé
2019-10-09 22:53   ` Paul Burton
2019-10-07 22:20 ` [PATCH 2/4] MIPS: cmdline: Remove CONFIG_MIPS_CMDLINE_DTB_EXTEND Paul Burton
2019-10-09 12:35   ` Philippe Mathieu-Daudé
2019-10-07 22:20 ` [PATCH 4/4] MIPS: cmdline: Clean up boot_command_line initialization Paul Burton
2019-10-09 12:34 ` [PATCH 1/4] MIPS: cmdline: Remove CONFIG_MIPS_CMDLINE_BUILTIN_EXTEND Philippe Mathieu-Daudé
2019-10-09 13:46 ` Maciej W. Rozycki
2019-10-09 14:13   ` Maciej W. Rozycki
2019-10-09 19:39     ` Paul Burton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).