From 7ace858bf1b1be1f2a98f94caf3449e806c885df Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 12 Sep 2016 23:18:51 -0600 Subject: [PATCH] Convert CONFIG_SPL_NOR_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- configs/a3m071_defconfig | 1 + configs/a4m2k_defconfig | 1 + configs/edminiv2_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/uniphier_ld11_defconfig | 1 + configs/uniphier_ld20_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + configs/uniphier_sld3_defconfig | 1 + configs/x600_defconfig | 1 + include/configs/a3m071.h | 1 - include/configs/edminiv2.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/uniphier.h | 1 - include/configs/x600.h | 1 - 16 files changed, 11 insertions(+), 5 deletions(-) diff --git a/configs/a3m071_defconfig b/configs/a3m071_defconfig index cfb4ca4f43..67f59ab951 100644 --- a/configs/a3m071_defconfig +++ b/configs/a3m071_defconfig @@ -8,6 +8,7 @@ CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_LOOPW=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/a4m2k_defconfig b/configs/a4m2k_defconfig index ef1c6e56d4..e688efe765 100644 --- a/configs/a4m2k_defconfig +++ b/configs/a4m2k_defconfig @@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="A4M2K" CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_LOOPW=y # CONFIG_CMD_SETEXPR is not set diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig index 43e0091949..bed6335ea3 100644 --- a/configs/edminiv2_defconfig +++ b/configs/edminiv2_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_TARGET_EDMINIV2=y CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="EDMiniV2> " CONFIG_CMD_I2C=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 094952a11d..374b109564 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -13,6 +13,7 @@ CONFIG_FIT_VERBOSE=y CONFIG_BOOTDELAY=-1 CONFIG_SPL=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot-mONStR> " CONFIG_CMD_ASKENV=y diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index 703d8711ea..39d4150edf 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_UNIPHIER_LD11=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld11-ref" +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_ENV_EXISTS is not set diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index c4a8547074..d5f901e274 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_UNIPHIER_LD20=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld20-ref" +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_XIMG is not set # CONFIG_CMD_ENV_EXISTS is not set diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index e3ad160e3b..f20ea29cc8 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_UNIPHIER_LD4_SLD8=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref" +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_XIMG is not set diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index a7dcc56002..8ee2e840e1 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_UNIPHIER=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_XIMG is not set diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index 131c416580..1d54cde884 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-proxstream2-vodka" +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_XIMG is not set diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 1c5cece5e0..9114225eae 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -4,6 +4,7 @@ CONFIG_ARCH_UNIPHIER_SLD3=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld3-ref" +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_XIMG is not set diff --git a/configs/x600_defconfig b/configs/x600_defconfig index a9604add5f..b9535249e5 100644 --- a/configs/x600_defconfig +++ b/configs/x600_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_BOOTDELAY=3 CONFIG_SPL=y +CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="X600> " CONFIG_AUTOBOOT_KEYED=y diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index 5b164613e6..b40b1ea746 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -397,7 +397,6 @@ */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_TEXT_BASE 0xfc000000 #define CONFIG_SPL_SERIAL_SUPPORT diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 68296b35f1..64d1b667f5 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -18,7 +18,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_TEXT_BASE 0xffff0000 #define CONFIG_SPL_MAX_SIZE 0x0000fff0 #define CONFIG_SPL_STACK 0x00020000 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 43934ddb91..2b38c38114 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -292,7 +292,6 @@ #define CONFIG_SPL_RAM_DEVICE #ifdef CONFIG_SYS_FLASH_BASE -# define CONFIG_SPL_NOR_SUPPORT # define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_FLASH_BASE #endif diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index a85142e040..9bfa5168da 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -278,7 +278,6 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NOR_SUPPORT #ifdef CONFIG_ARM64 #define CONFIG_SPL_BOARD_LOAD_IMAGE #endif diff --git a/include/configs/x600.h b/include/configs/x600.h index 25308ef47d..1bf54852c3 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -267,7 +267,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds" #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NOR_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT /* -- 2.25.1