[PoC 130/241] global: Migrate CONFIG_MXC_USB_FLAGS to CFG

Tom Rini
2022-11-20T14:13:48Z

drivers/usb/host/ehci-mx5.c | 2 +-
include/configs/apalis_imx6.h | 2 +-
include/configs/aristainetos2.h | 2 +-
include/configs/cl-som-imx7.h | 2 +-
include/configs/cm_fx6.h | 2 +-
include/configs/colibri-imx6ull.h | 2 +-
include/configs/colibri_imx6.h | 2 +-
include/configs/colibri_imx7.h | 2 +-
include/configs/dart_6ul.h | 2 +-
include/configs/dh_imx6.h | 2 +-
include/configs/embestmx6boards.h | 2 +-
include/configs/ge_b1x5v2.h | 2 +-
include/configs/gw_ventana.h | 2 +-
include/configs/imx6_logic.h | 2 +-
include/configs/imx6dl-mamoj.h | 2 +-
include/configs/imx6q-bosch-acc.h | 2 +-
include/configs/kontron-sl-mx6ul.h | 2 +-
include/configs/kontron-sl-mx8mm.h | 2 +-
include/configs/kp_imx53.h | 2 +-
include/configs/kp_imx6q_tpc.h | 2 +-
include/configs/liteboard.h | 2 +-
include/configs/m53menlo.h | 2 +-
include/configs/mx51evk.h | 2 +-
include/configs/mx53cx9020.h | 2 +-
include/configs/mx53loco.h | 2 +-
include/configs/mx53ppd.h | 2 +-
include/configs/mx6sabreauto.h | 2 +-
include/configs/mx6sabresd.h | 2 +-
include/configs/mx6slevk.h | 2 +-
include/configs/mx6sxsabreauto.h | 2 +-
include/configs/mx6sxsabresd.h | 2 +-
include/configs/mx6ul_14x14_evk.h | 2 +-
include/configs/mys_6ulx.h | 2 +-
include/configs/nitrogen6x.h | 2 +-
include/configs/novena.h | 2 +-
include/configs/npi_imx6ull.h | 2 +-
include/configs/opos6uldev.h | 2 +-
include/configs/pcl063.h | 2 +-
include/configs/pcl063_ull.h | 2 +-
include/configs/pico-imx6.h | 2 +-
include/configs/pico-imx6ul.h | 2 +-
include/configs/pico-imx7d.h | 2 +-
include/configs/somlabs_visionsom_6ull.h | 2 +-
include/configs/usbarmory.h | 2 +-
include/configs/vining_2000.h | 2 +-
include/configs/wandboard.h | 2 +-
include/configs/xpress.h | 2 +-
scripts/config_whitelist.txt | 2 +-
48 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 964a53bb7c0e..bdfc1283e4aa 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -302,7 +302,7 @@ static int ehci_usb_probe(struct udevice *dev)
__raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
setbits_le32(&ehci->portsc, USB_EN);

- mxc_set_usbcontrol(priv->portnr, CONFIG_MXC_USB_FLAGS);
+ mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
mdelay(10);

return ehci_register(dev, hccr, hcor, &mx5_ehci_ops, 0,
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index b1355d637538..fd2a0e3d82d3 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -27,7 +27,7 @@
/* USB Configs */
/* Host */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
/* Client */
#define CONFIG_USBD_HS

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 271d15dc5e50..19906db5966f 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -416,7 +416,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* UBI support */

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b7920c7b3057..e38d2844c803 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -97,6 +97,6 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#endif /* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 90ebec4a94ca..479feae77240 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -136,7 +136,7 @@

/* USB */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* Boot */
#define CFG_SYS_BOOTMAPSZ (8 << 20)
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 4f5287b6bcfb..92dff580f601 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -128,7 +128,7 @@
/* USB Configs */

#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CONFIG_USBD_HS

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 5f098fab940e..419c919bbecd 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -24,7 +24,7 @@
/* USB Configs */
/* Host */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
/* Client */
#define CONFIG_USBD_HS

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 0da7553e0245..2b2b17f2c7b9 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -172,7 +172,7 @@
/* USB Configs */

#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CONFIG_USBD_HS

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index fb619105a760..93ee004b009c 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -48,7 +48,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define ENV_MMC \
"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index e9c36cdb80e9..90f8ce0fd57f 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -33,7 +33,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* USB Gadget (DFU, UMS) */
#if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE)
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 9b772d2bd367..f73b1ec63de6 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -19,7 +19,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 703d63bd20bc..f7e9dd16b26f 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -25,7 +25,7 @@

/* USB */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS

/* Memory */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 3713ba4dbceb..cc21e93a7beb 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -37,7 +37,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS

/* Miscellaneous configurable options */
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f9544cd430ca..215ed75deaf3 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -118,7 +118,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

/* Falcon Mode */
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index db08e43f0d86..ca89f72f8a21 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -44,7 +44,7 @@

/* USB */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* Falcon */

diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index e28185f24dd3..4209d9d7ab28 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -111,6 +111,6 @@
#endif

#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#endif /* __IMX6Q_ACC_H */
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 523cb5a07fd0..3479b0b2bf4d 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -27,7 +27,7 @@

#ifdef CONFIG_USB_EHCI_HCD
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

/* Boot order for distro boot */
diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 657124cc725d..89f5c6f46faf 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -27,7 +27,7 @@

#ifdef CONFIG_USB_EHCI_HCD
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

/* GUID for capsule updatable firmware image */
diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index da8a67b4ab63..baf7779026fb 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -12,7 +12,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* Command definition */

diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 99321b320f5f..07497d063fb8 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -19,7 +19,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 63e5dbfab775..75ff2d9db93c 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -96,7 +96,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 2ffee5b2e930..d7b303b6ac05 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -73,7 +73,7 @@
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

/* LVDS display */
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 123b7a533b17..e82e7547a3f6 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -35,7 +35,7 @@
/* USB Configs */
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI
-#define CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED
+#define CFG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED

/* Framebuffer and LCD */

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 1a3ec6e0cdb8..5710fe90708a 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -25,7 +25,7 @@
/* USB Configs */
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* Command definition */

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index d87f9e942c51..cd7fa7c8cd96 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -19,7 +19,7 @@
/* USB Configs */
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* PMIC Controller */
#define CFG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 94d2191af91d..57dffbf6e40c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -14,7 +14,7 @@
/* USB Configs */
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* Command definition */

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 274c14bbd383..1d96ecfa46cb 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -13,7 +13,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CFG_SYS_I2C_PCA953X_WIDTH { {0x30, 8}, {0x32, 8}, {0x34, 8} }

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index af9978e02c89..b2266025efcf 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -30,7 +30,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#endif /* __MX6SABRESD_CONFIG_H */
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index f6d9ac20821f..5d5fc8f792de 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -91,7 +91,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#define CFG_SYS_FSL_USDHC_NUM 3
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 3d0f6e452d65..ff5ef7306611 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -97,7 +97,7 @@

#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#define CFG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8c39e6d6cf4d..82dbf0f949c5 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -119,7 +119,7 @@

#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_PCI
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 3f8a90b626d1..2d26d9b045af 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -117,7 +117,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index 0c0235b42984..a8a14600cc2d 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -31,7 +31,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CFG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index fabd82d6c9c6..c634cb203b36 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -24,7 +24,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#ifdef CONFIG_CMD_MMC
#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
diff --git a/include/configs/novena.h b/include/configs/novena.h
index dd82c04440ec..6088b2823412 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -58,7 +58,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
/* Gadget part */
#define CONFIG_USBD_HS
#endif
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index ae5e566d3fb0..490328d516f2 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -32,7 +32,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#ifdef CONFIG_CMD_NET
#define CFG_FEC_MXC_PHYADDR 0x1
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index e42a736136bc..5587237743c9 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -21,7 +21,7 @@
/* USB */
#ifdef CONFIG_USB_EHCI_MX6
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

/* LCD */
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index e8c48cf83652..c95507b25fe9 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -43,7 +43,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CFG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index bd04268a3ef3..688afe674591 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -45,7 +45,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define ENV_MMC \
"mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index a1d0dd93c526..473f476aa470 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -17,7 +17,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define DFU_DEFAULT_POLL_TIMEOUT 300

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 4064a34f191b..ba37e6765eed 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -24,7 +24,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CONFIG_USBD_HS

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index dbeaeea77f7d..5995ce66ec8b 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -108,6 +108,6 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#endif
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 3418d4e2b559..1e3ae0398c1a 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -62,7 +62,7 @@
/* USB Configs */
#ifdef CONFIG_CMD_USB
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 854875adc4b7..8cea69416df2 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -25,7 +25,7 @@
/* USB */
#define CONFIG_MXC_USB_PORT 1
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

/* Linux boot */
#define CFG_HOSTNAME "usbarmory"
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 7954ed9910c7..193706e46fa5 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -37,7 +37,7 @@
#define CFG_FEC_MXC_PHYADDR 0x0

#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#ifdef CONFIG_CMD_PCI
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(4, 6)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 8853bcd7be28..64dbf93d05d0 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -18,7 +18,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CFG_EXTRA_ENV_SETTINGS \
"console=ttymxc0\0" \
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 602fd4595e77..c17f0de7ede3 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -29,7 +29,7 @@

/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_FLAGS 0

#define CFG_FEC_ENET_DEV 0
#define CFG_FEC_MXC_PHYADDR 0x0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2f3241289842..7c3c4bca17b7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -138,7 +138,7 @@ CFG_MXC_NAND_HWECC
CFG_MXC_NAND_IP_REGS_BASE
CFG_MXC_NAND_REGS_BASE
CFG_MXC_UART_BASE
-CONFIG_MXC_USB_FLAGS
+CFG_MXC_USB_FLAGS
CONFIG_MXC_USB_PORT
CONFIG_MXC_USB_PORTSC
CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
--
2.25.1