global: Migrate CONFIG_ENV_SETTINGS_NAND_V1 to CFG

Perform a simple rename of CONFIG_ENV_SETTINGS_NAND_V1 to CFG_ENV_SETTINGS_NAND_V1

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index eafa6ae..c6a0127 100644 (file)
--- 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 ac48372..f51771f 100644 (file)
--- 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 406a179..296ac34 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -196,7 +196,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" \