arm: mxs: Correct CONFIG_SPL_NO_CPU_SUPPORT option

At present this is defined in Kconfig but there is a separate one in the
CONFIG whitelist. It looks like these are duplicates.

Rename the non-Kconfig one and remove it from the whitelist.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile
index fdb0c926fb2ced72fbc7511707573ed336de5741..b051025bb0a568d9c36883942b5cbf89802d6c5d 100644 (file)
--- a/arch/arm/cpu/arm926ejs/Makefile
+++ b/arch/arm/cpu/arm926ejs/Makefile
@@ -7,7 +7,7 @@ extra-y = start.o
 obj-y  = cpu.o cache.o
 
 ifdef  CONFIG_SPL_BUILD
-ifdef  CONFIG_SPL_NO_CPU_SUPPORT_CODE
+ifdef  CONFIG_SPL_NO_CPU_SUPPORT
 extra-y        :=
 endif
 endif

diff --git a/include/configs/mxs.h b/include/configs/mxs.h
index 6cadd720d2b958cc01821f4934f40b7eb4dbe573..e079f8035b8baf8fc1f822c761dd6f0d26b0614c 100644 (file)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -45,7 +45,7 @@
 
 /* SPL */
 #ifndef CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_NO_CPU_SUPPORT_CODE
+#define CONFIG_SPL_NO_CPU_SUPPORT
 #define CONFIG_SPL_START_S_PATH        "arch/arm/cpu/arm926ejs/mxs"
 #endif
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5a007d37091cc38c698f20a1f5d3ddd6e610215d..cb855354ae9308a94960363d83b1c2559acee5f3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1721,7 +1721,6 @@ CONFIG_SPL_NAND_MINIMAL
 CONFIG_SPL_NAND_RAW_ONLY
 CONFIG_SPL_NAND_SOFTECC
 CONFIG_SPL_NAND_WORKSPACE
-CONFIG_SPL_NO_CPU_SUPPORT_CODE
 CONFIG_SPL_PAD_TO
 CONFIG_SPL_PANIC_ON_RAW_IMAGE
 CONFIG_SPL_PBL_PAD