Signed-off-by: Tom Rini <tr...@konsulko.com>
---
arch/sh/cpu/u-boot.lds | 2 +-
doc/README.kwbimage | 2 +-
scripts/Makefile.autoconf | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds
index d360eea7eba3..c31deecec659 100644
--- a/arch/sh/cpu/u-boot.lds
+++ b/arch/sh/cpu/u-boot.lds
@@ -35,7 +35,7 @@ SECTIONS
.text :
{
KEEP(*/start.o (.text))
- KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text))
+ KEEP(CFG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text))
KEEP(*(.spiboot2.text))
. = ALIGN(8192);
#ifdef CONFIG_ENV_IS_IN_FLASH
diff --git a/doc/README.kwbimage b/doc/README.kwbimage
index 762b2e3acb71..a1d247c32dd1 100644
--- a/doc/README.kwbimage
+++ b/doc/README.kwbimage
@@ -42,7 +42,7 @@ Board specific configuration file specifications:
kwbimage.cfg. The name can be set as part of the full path
to the file using CONFIG_SYS_KWD_CONFIG (probably in
include/configs/<yourboard>.h). The path should look like:
- $(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg
+ $(CFG_BOARDDIR)/<yourkwbimagename>.cfg
2. This file can have empty lines and lines starting with "#" as first
character to put comments
3. This file can have configuration command lines as mentioned below,
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index 5a4a14895538..f5f5e4a4d540 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg
# Prior to Kconfig, it was generated by mkconfig. Now it is created here.
define filechk_config_h
(echo "/* Automatically generated - do not edit */"; \
- echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
+ echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\
echo \#include \<config_uncmd_spl.h\>; \
echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \
echo \#include \<asm/config.h\>; \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0d2cbddeed40..14863642e4d3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,5 +1,5 @@
CFG_ARM_GIC_BASE_ADDRESS
-CONFIG_BOARDDIR
+CFG_BOARDDIR
CONFIG_DFU_ALT
CONFIG_DFU_ALT_BOOT_EMMC
CONFIG_DFU_ALT_BOOT_SD
--
2.25.1
