[PATCH 087/149] global: Migrate CONFIG_MFG_ENV_SETTINGS to CFG

Tom Rini
2022-12-04T15:22:41Z

Perform a simple rename of CONFIG_MFG_ENV_SETTINGS to CFG_MFG_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
---
include/configs/capricorn-common.h | 4 ++--
include/configs/cgtqmx8.h | 4 ++--
include/configs/colibri-imx8x.h | 4 ++--
include/configs/imx8mq_phanbell.h | 4 ++--
include/configs/imx8qm_rom7720.h | 4 ++--
include/configs/mx7dsabresd.h | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 9e7322cdb937..9dcacad2fc00 100644
--- 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 a63325973846..91454df19720 100644
--- 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 13bc4e7e682a..2de116c59da7 100644
--- 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 5158f2cc605a..6d0c45311183 100644
--- 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 5692e3d00007..df2cb8d9ced1 100644
--- 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 e56083f8e61c..9c938f04e93c 100644
--- 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" \
--
2.25.1