[PoC 024/241] global: Migrate CONFIG_FDTFILE to CFG

Tom Rini
2022-11-20T13:38:23Z

include/configs/MPC837XERDB.h | 4 ++--
include/configs/embestmx6boards.h | 6 +++---
scripts/config_whitelist.txt | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 2a71e0ad4dce..2eea26d7bee7 100644
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -229,7 +229,7 @@
#define CONFIG_ROOTPATH "/nfsroot"
/* U-Boot image on TFTP server */
#define CONFIG_UBOOTPATH "u-boot.bin"
-#define CONFIG_FDTFILE "mpc8379_rdb.dtb"
+#define CFG_FDTFILE "mpc8379_rdb.dtb"

#define CFG_EXTRA_ENV_SETTINGS \
"netdev=" CONFIG_NETDEV "\0" \
@@ -246,7 +246,7 @@
"cmp.b $loadaddr " __stringify(CONFIG_TEXT_BASE) \
" $filesize\0" \
"fdtaddr=780000\0" \
- "fdtfile=" CONFIG_FDTFILE "\0" \
+ "fdtfile=" CFG_FDTFILE "\0" \
"ramdiskaddr=1000000\0" \
"ramdiskfile=rootfs.ext2.gz.uboot\0" \
"console=ttyS0\0" \
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 4a929937b416..8f03c2ff3c0d 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -35,11 +35,11 @@

#if defined(CONFIG_ENV_IS_IN_MMC)
/* RiOTboard */
-#define CONFIG_FDTFILE "imx6dl-riotboard.dtb"
+#define CFG_FDTFILE "imx6dl-riotboard.dtb"
#define CFG_SYS_FSL_USDHC_NUM 3
#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
/* MarSBoard */
-#define CONFIG_FDTFILE "imx6q-marsboard.dtb"
+#define CFG_FDTFILE "imx6q-marsboard.dtb"
#define CFG_SYS_FSL_USDHC_NUM 2
#endif

@@ -79,7 +79,7 @@
#define CFG_EXTRA_ENV_SETTINGS \
CONSOLE_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
- "fdtfile=" CONFIG_FDTFILE "\0" \
+ "fdtfile=" CFG_FDTFILE "\0" \
"finduuid=part uuid mmc 0:1 uuid\0" \
BOOTENV

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index e436bf55d94d..6a20473cd6ea 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -24,7 +24,7 @@ CFG_ETHBASE
CFG_EXTRA_ENV_SETTINGS
CFG_FB_ADDR
CFG_FDTADDR
-CONFIG_FDTFILE
+CFG_FDTFILE
CONFIG_FEC_ENET_DEV
CONFIG_FEC_FIXED_SPEED
CONFIG_FEC_MXC_PHYADDR
--
2.25.1