[PoC 013/241] global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG

Tom Rini
2022-11-20T13:36:43Z

include/configs/pxm2.h | 2 +-
include/configs/rut.h | 2 +-
include/configs/siemens-am33x-common.h | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index eafa6ae9a9a0..c6a01270a54d 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -37,7 +37,7 @@
CFG_ENV_SETTINGS_BUTTONS_AND_LEDS \
"splashpos=m,m\0" \
CONFIG_ENV_SETTINGS_V1 \
- CONFIG_ENV_SETTINGS_NAND_V1 \
+ CFG_ENV_SETTINGS_NAND_V1 \
"mmc_dev=0\0" \
"mmc_root=/dev/mmcblk0p2 rw\0" \
"mmc_root_fs_type=ext4 rootwait\0" \
diff --git a/include/configs/rut.h b/include/configs/rut.h
index ac48372b6c0b..f51771f9ca46 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -34,7 +34,7 @@
"splashpos=m,m\0" \
"optargs=fixrtc --no-log consoleblank=0 \0" \
CONFIG_ENV_SETTINGS_V1 \
- CONFIG_ENV_SETTINGS_NAND_V1 \
+ CFG_ENV_SETTINGS_NAND_V1 \
"mmc_dev=0\0" \
"mmc_root=/dev/mmcblk0p2 rw\0" \
"mmc_root_fs_type=ext4 rootwait\0" \
diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 5a001716fb01..20efa468ac3d 100644
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -201,7 +201,7 @@
"kernel_b part 0 8;" \
"rootfs partubi 0 10"

-#define CONFIG_ENV_SETTINGS_NAND_V1 \
+#define CFG_ENV_SETTINGS_NAND_V1 \
"nand_active_ubi_vol=rootfs_a\0" \
"nand_active_ubi_vol_A=rootfs_a\0" \
"nand_active_ubi_vol_B=rootfs_b\0" \
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index cb880dc317fc..25bfb7ee89e7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -13,7 +13,7 @@ CFG_DW_WDT_CLOCK_KHZ
CFG_ENV_FLAGS_LIST_STATIC
CFG_ENV_IS_EMBEDDED
CFG_ENV_SETTINGS_BUTTONS_AND_LEDS
-CONFIG_ENV_SETTINGS_NAND_V1
+CFG_ENV_SETTINGS_NAND_V1
CONFIG_ENV_SETTINGS_NAND_V2
CONFIG_ENV_SETTINGS_V1
CONFIG_ENV_SETTINGS_V2
--
2.25.1