Convert CONFIG_SYS_BOOT_RAMDISK_HIGH to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_BOOT_RAMDISK_HIGH

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index dae467a..fb0284d 100644 (file)
--- a/README
+++ b/README
@@ -1754,11 +1754,6 @@ Configuration Settings:
                CONFIG_SYS_BOOTMAPSZ.  If CONFIG_SYS_BOOTMAPSZ is undefined,
                then the value in "bootm_size" will be used instead.
 
-- CONFIG_SYS_BOOT_RAMDISK_HIGH:
-               Enable initrd_high functionality.  If defined then the
-               initrd_high feature is enabled and the bootm ramdisk subcommand
-               is enabled.
-
 - CONFIG_SYS_BOOT_GET_CMDLINE:
                Enables allocating and saving kernel cmdline in space between
                "bootm_low" and "bootm_low" + BOOTMAPSZ.

diff --git a/arch/arc/include/asm/config.h b/arch/arc/include/asm/config.h
index 46e94be..afdfcaa 100644 (file)
--- a/arch/arc/include/asm/config.h
+++ b/arch/arc/include/asm/config.h
@@ -6,6 +6,4 @@
 #ifndef __ASM_ARC_CONFIG_H_
 #define __ASM_ARC_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif /*__ASM_ARC_CONFIG_H_ */

diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h
index be44b76..5870412 100644 (file)
--- a/arch/arm/include/asm/config.h
+++ b/arch/arm/include/asm/config.h
@@ -6,8 +6,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #if defined(CONFIG_ARCH_LS1021A) || \
        defined(CONFIG_FSL_LAYERSCAPE)
 #include <asm/arch/config.h>

diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h
index 221eb93..bad0026 100644 (file)
--- a/arch/m68k/include/asm/config.h
+++ b/arch/m68k/include/asm/config.h
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif

diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h
index 221eb93..bad0026 100644 (file)
--- a/arch/microblaze/include/asm/config.h
+++ b/arch/microblaze/include/asm/config.h
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif

diff --git a/arch/mips/include/asm/config.h b/arch/mips/include/asm/config.h
index 221eb93..bad0026 100644 (file)
--- a/arch/mips/include/asm/config.h
+++ b/arch/mips/include/asm/config.h
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif

diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h
index 059ffe1..79fe567 100644 (file)
--- a/arch/powerpc/include/asm/config.h
+++ b/arch/powerpc/include/asm/config.h
@@ -14,8 +14,6 @@
   #define HWCONFIG_BUFFER_SIZE 256
 #endif
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #ifndef CONFIG_MAX_MEM_MAPPED
 #if    defined(CONFIG_E500)            || \
        defined(CONFIG_MPC86xx)         || \

diff --git a/arch/riscv/include/asm/config.h b/arch/riscv/include/asm/config.h
index d911007..c55c85d 100644 (file)
--- a/arch/riscv/include/asm/config.h
+++ b/arch/riscv/include/asm/config.h
@@ -7,6 +7,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif

diff --git a/arch/x86/include/asm/config.h b/arch/x86/include/asm/config.h
index 221eb93..bad0026 100644 (file)
--- a/arch/x86/include/asm/config.h
+++ b/arch/x86/include/asm/config.h
@@ -6,6 +6,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_SYS_BOOT_RAMDISK_HIGH
-
 #endif

diff --git a/boot/Kconfig b/boot/Kconfig
index e7a4d53..17438b5 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -606,6 +606,14 @@ config SYS_FSL_PBL_RCW
          Enables addition of RCW (Power on reset configuration) in built image.
          Please refer doc/README.pblimage for more details.
 
+config SYS_BOOT_RAMDISK_HIGH
+       depends on CMD_BOOTM || CMD_BOOTI || CMD_BOOTZ
+       depends on !(NIOS2 || SANDBOX || SH || XTENSA)
+       def_bool y
+       help
+         Enable initrd_high functionality.  If defined then the initrd_high
+         feature is enabled and the boot* ramdisk subcommand is enabled.
+
 endmenu                # Boot images
 
 menu "Boot timing"

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b0d693a..6faa64f 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -565,7 +565,6 @@ CONFIG_SYS_BOOTCOUNT_LE
 CONFIG_SYS_BOOTMAPSZ
 CONFIG_SYS_BOOTM_LEN
 CONFIG_SYS_BOOT_BLOCK
-CONFIG_SYS_BOOT_RAMDISK_HIGH
 CONFIG_SYS_CACHE_ACR0
 CONFIG_SYS_CACHE_ACR1
 CONFIG_SYS_CACHE_ACR2