global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG

Perform a simple rename of CONFIG_MFG_ENV_SETTINGS to CFG_MFG_ENV_SETTINGS

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

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 9e7322cdb937898e96a94d4d8121fa3e2c71d19a..9dcacad2fc009bd3bb837e1d1f834ac075cf840f 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -60,7 +60,7 @@
                        "${loadaddr} ${m4_0_image}\0" \
        "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
        MFG_ENV_SETTINGS_DEFAULT \
        "initrd_addr=0x83100000\0" \
        "initrd_high=0xffffffffffffffff\0" \
@@ -68,7 +68,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS \
-       CONFIG_MFG_ENV_SETTINGS \
+       CFG_MFG_ENV_SETTINGS \
        M4_BOOT_ENV \
        AHAB_ENV \
        ENV_COMMON \

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index a63325973846b90d12cb9d0343f456477cce0f6a..91454df197207e7b763f4ed6e2778a05b9e0ba77 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -42,7 +42,7 @@
 #define FEC0_RESET IMX_GPIO_NR(2, 5)
 #define FEC0_PDOMAIN "conn_enet0"
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
        "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
                "rdinit=/linuxrc " \
                "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -56,7 +56,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS         \
-       CONFIG_MFG_ENV_SETTINGS \
+       CFG_MFG_ENV_SETTINGS \
        M4_BOOT_ENV \
        "script=boot.scr\0" \
        "image=Image\0" \

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 13bc4e7e682ac914cadccf01472f42752685a1bb..2de116c59da7f67c178f752ba585d9cb9fd9f7e9 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -43,7 +43,7 @@
 #undef BOOTENV_RUN_NET_USB_START
 #define BOOTENV_RUN_NET_USB_START ""
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
        "mfgtool_args=setenv bootargs ${consoleargs} " \
                "rdinit=/linuxrc g_mass_storage.stall=0 " \
                "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
@@ -59,7 +59,7 @@
 #define CFG_EXTRA_ENV_SETTINGS \
        AHAB_ENV \
        BOOTENV \
-       CONFIG_MFG_ENV_SETTINGS \
+       CFG_MFG_ENV_SETTINGS \
        M4_BOOT_ENV \
        MEM_LAYOUT_ENV_SETTINGS \
        "boot_file=Image\0" \

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 5158f2cc605a5a86e8f3f939c390888a08abe0b5..6d0c4531118336e71c8dad3902e5eec5a69db4c2 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -24,13 +24,13 @@
 #define CFG_FEC_MXC_PHYADDR          0
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
        "initrd_addr=0x43800000\0" \
        "initrd_high=0xffffffff\0" \
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS         \
-       CONFIG_MFG_ENV_SETTINGS \
+       CFG_MFG_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=Image\0" \
        "console=ttymxc0,115200\0" \

diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h
index 5692e3d00007874fea44d91466b5d6a57e8b5236..df2cb8d9ced128e94588ccc5d383baadd5ad2e7a 100644 (file)
--- a/include/configs/imx8qm_rom7720.h
+++ b/include/configs/imx8qm_rom7720.h
@@ -33,7 +33,7 @@
 #define MFG_NAND_PARTITION ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
        "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
                "rdinit=/linuxrc " \
                "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -48,7 +48,7 @@
 
 /* Initial environment variables */
 #define CFG_EXTRA_ENV_SETTINGS         \
-       CONFIG_MFG_ENV_SETTINGS \
+       CFG_MFG_ENV_SETTINGS \
        M4_BOOT_ENV \
        "script=boot.scr\0" \
        "image=Image\0" \

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index e56083f8e61c0e3c837280e4ab370c745507da3f..9c938f04e93c91dba27b486c4e66efd36a2689a0 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -32,7 +32,7 @@
 #define UPDATE_M4_ENV ""
 #endif
 
-#define CONFIG_MFG_ENV_SETTINGS \
+#define CFG_MFG_ENV_SETTINGS \
        "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
                "rdinit=/linuxrc " \
                "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
@@ -52,7 +52,7 @@
 
 #define CFG_EXTRA_ENV_SETTINGS \
        UPDATE_M4_ENV \
-       CONFIG_MFG_ENV_SETTINGS \
+       CFG_MFG_ENV_SETTINGS \
        CFG_DFU_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \