diff options
| author | Derald D. Woods <woods.technical@gmail.com> | 2018-01-23 02:17:10 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-30 20:52:57 +0300 |
| commit | 405fc8305baef921593b822809fb7bf60474b73f (patch) | |
| tree | c9ac71913be9076fc226ee51603b819e04ee9176 | |
| parent | f1554b28d31250df5418254e79e0bf75ff3b2e54 (diff) | |
| download | u-boot-405fc8305baef921593b822809fb7bf60474b73f.tar.xz | |
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>
| -rw-r--r-- | Kconfig | 12 | ||||
| -rw-r--r-- | arch/Kconfig | 4 | ||||
| -rw-r--r-- | arch/m68k/include/asm/config.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/config.h | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
5 files changed, 16 insertions, 6 deletions
@@ -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 762230cd56..5d57d6da2c 100644 --- 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 9c4d3fb8fd..fd0b5513ee 100644 --- 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 6aec815c71..67e4b48a96 100644 --- 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 efcb251e44..9ad3907c53 100644 --- 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 |