Convert CONFIG_SYS_BOOT_GET_{CMDLINE, KBD} to Kconfig

This converts the following to Kconfig:
	CONFIG_SYS_BOOT_GET_CMDLINE
	CONFIG_SYS_BOOT_GET_KBD

Signed-off-by: Derald D. Woods <woods.technical@gmail.com>

diff --git a/Kconfig b/Kconfig
index 9b8a8077993a1d4c6125988f890c0067dfef0240..f713c6a9b188a99249f60248444585d2b69a860a 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -83,6 +83,18 @@ config DISTRO_DEFAULTS
          Select this to enable various options and commands which are suitable
          for building u-boot for booting general purpose Linux distributions.
 
+config SYS_BOOT_GET_CMDLINE
+       bool "Enable kernel command line setup"
+       help
+         Enables allocating and saving kernel cmdline in space between
+         "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
+config SYS_BOOT_GET_KBD
+       bool "Enable kernel board information setup"
+       help
+         Enables allocating and saving a kernel copy of the bd_info in
+         space between "bootm_low" and "bootm_low" + BOOTMAPSZ.
+
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
        default y if DM

diff --git a/arch/Kconfig b/arch/Kconfig
index 762230cd5644362a7a4ce395e13d3323396cf60e..5d57d6da2c83a25cffed6f74d4f87668dccba8f8 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -26,6 +26,8 @@ config ARM
 config M68K
        bool "M68000 architecture"
        select HAVE_PRIVATE_LIBGCC
+       select SYS_BOOT_GET_CMDLINE
+       select SYS_BOOT_GET_KBD
 
 config MICROBLAZE
        bool "MicroBlaze architecture"
@@ -53,6 +55,8 @@ config PPC
        bool "PowerPC architecture"
        select HAVE_PRIVATE_LIBGCC
        select SUPPORT_OF_CONTROL
+       select SYS_BOOT_GET_CMDLINE
+       select SYS_BOOT_GET_KBD
 
 config RISCV
        bool "riscv architecture"

diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h
index 9c4d3fb8fd7e905fe9ba2bf598d095fea86e8e43..fd0b5513ee8fa69fe656191f970c529d8ea18904 100644 (file)
--- a/arch/m68k/include/asm/config.h
+++ b/arch/m68k/include/asm/config.h
@@ -11,7 +11,5 @@
 
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
 
 #endif

diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index 6aec815c712fc1acee3025a13ccbc180371e68ae..67e4b48a96aac7a04b712f57318d7befa830977c 100644 (file)
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -31,8 +31,6 @@
 
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-#define CONFIG_SYS_BOOT_GET_KBD
 
 #ifndef CONFIG_MAX_MEM_MAPPED
 #if    defined(CONFIG_E500)            || \

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index efcb251e442a57518bab607b937505b48f37c946..9ad3907c53bb2c07520082da04e912b442c45b6e 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2250,8 +2250,6 @@ CONFIG_SYS_BOOTM_LEN
 CONFIG_SYS_BOOTPARAMS_LEN
 CONFIG_SYS_BOOTSZ
 CONFIG_SYS_BOOT_BLOCK
-CONFIG_SYS_BOOT_GET_CMDLINE
-CONFIG_SYS_BOOT_GET_KBD
 CONFIG_SYS_BOOT_RAMDISK_HIGH
 CONFIG_SYS_BR0_64M
 CONFIG_SYS_BR0_8M