This converts the following to Kconfig: CONFIG_HUSH_INIT_VAR
Signed-off-by: Tom Rini trini@konsulko.com --- board/keymile/Kconfig | 3 +++ include/configs/km/keymile-common.h | 2 -- include/configs/socfpga_arria5_secu1.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index 863c07db47d5..f22faee0ee42 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -11,6 +11,9 @@ if VENDOR_KM
menu "KM Board Setup"
+config HUSH_INIT_VAR + def_bool y + config KM_PNVRAM hex "Pseudo RAM" default 0x80000 diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 64d121bb5b51..4bca1a783020 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -13,8 +13,6 @@ * Miscellaneous configurable options */
-#define CONFIG_HUSH_INIT_VAR - #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_LOADS_ECHO diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 88fd8ae44cc9..3a77c71874d9 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> #include <linux/stringify.h>
-#define CONFIG_HUSH_INIT_VAR /* Eternal oscillator */ #define CONFIG_SYS_TIMER_RATE 40000000
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 035aa9a433ad..7c114cd227f5 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -282,7 +282,6 @@ CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP CONFIG_HSMMC2_8BIT -CONFIG_HUSH_INIT_VAR CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS