diff options
| author | Simon Glass <sjg@chromium.org> | 2019-09-25 17:56:26 +0300 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2019-10-08 08:57:45 +0300 |
| commit | 535e07846af6d05eece6e51e4c7b53239d3ac8ba (patch) | |
| tree | 49e048089cdbea9ed585f238954b8a802d62ba31 | |
| parent | 9da3776bf6d782be47edcc8f15b89d1ffbd33724 (diff) | |
| download | u-boot-535e07846af6d05eece6e51e4c7b53239d3ac8ba.tar.xz | |
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>
| -rw-r--r-- | arch/arm/cpu/arm926ejs/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/mxs.h | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index fdb0c926fb..b051025bb0 100644 --- 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 6cadd720d2..e079f8035b 100644 --- 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 5a007d3709..cb855354ae 100644 --- 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 |