On Wed, Sep 25, 2019 at 10:58 PM Simon Glass <sjg@chromium.org> wrote: > > 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> > --- > > arch/arm/cpu/arm926ejs/Makefile | 2 +- > include/configs/mxs.h | 2 +- > scripts/config_whitelist.txt | 1 - > 3 files changed, 2 insertions(+), 3 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Sat, Oct 5, 2019 at 11:18 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > On Wed, Sep 25, 2019 at 10:58 PM Simon Glass <sjg@chromium.org> wrote: > > > > 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> > > --- > > > > arch/arm/cpu/arm926ejs/Makefile | 2 +- > > include/configs/mxs.h | 2 +- > > scripts/config_whitelist.txt | 1 - > > 3 files changed, 2 insertions(+), 3 deletions(-) > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> applied to u-boot-x86/next, thanks!
diff --git a/arch/arm/cpu/arm926ejs/Makefile b/arch/arm/cpu/arm926ejs/Makefile index fdb0c926fb2..b051025bb0a 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 6cadd720d2b..e079f8035b8 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 b06a77ebd66..169f98752be 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1728,7 +1728,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
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> --- arch/arm/cpu/arm926ejs/Makefile | 2 +- include/configs/mxs.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)