[PoC 131/241] global: Migrate CONFIG_MXC_USB_PORT to CFG

Tom Rini
2022-11-20T14:14:22Z

drivers/usb/host/ehci-mx5.c | 2 +-
drivers/usb/host/ehci-mx6.c | 8 ++++----
include/configs/apalis_imx6.h | 2 +-
include/configs/aristainetos2.h | 2 +-
include/configs/brppt2.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/display5.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/imx7-cm.h | 2 +-
include/configs/imx8mm-cl-iot-gate.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 | 4 ++--
include/configs/meerkat96.h | 2 +-
include/configs/mx51evk.h | 4 ++--
include/configs/mx53cx9020.h | 4 ++--
include/configs/mx53loco.h | 4 ++--
include/configs/mx53ppd.h | 4 ++--
include/configs/mx6cuboxi.h | 2 +-
include/configs/mx6memcal.h | 2 +-
include/configs/mx6sabreauto.h | 2 +-
include/configs/mx6sabresd.h | 2 +-
include/configs/mx6slevk.h | 2 +-
include/configs/mx6sllevk.h | 2 +-
include/configs/mx6sxsabreauto.h | 2 +-
include/configs/mx6sxsabresd.h | 2 +-
include/configs/mx6ul_14x14_evk.h | 2 +-
include/configs/mx7dsabresd.h | 2 +-
include/configs/mx7ulp_com.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/o4-imx6ull-nano.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/tbs2910.h | 2 +-
include/configs/tqma6.h | 2 +-
include/configs/usbarmory.h | 4 ++--
include/configs/verdin-imx8mm.h | 2 +-
include/configs/vining_2000.h | 2 +-
include/configs/wandboard.h | 2 +-
include/configs/warp7.h | 2 +-
include/configs/xpress.h | 2 +-
scripts/config_whitelist.txt | 4 ++--
64 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index bdfc1283e4aa..c11279867c7c 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -299,7 +299,7 @@ static int ehci_usb_probe(struct udevice *dev)
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
setbits_le32(&ehci->usbmode, CM_HOST);

- __raw_writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+ __raw_writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
setbits_le32(&ehci->portsc, USB_EN);

mxc_set_usbcontrol(priv->portnr, CFG_MXC_USB_FLAGS);
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index fa2ca2a1d912..0a12db614ff4 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -70,8 +70,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define UCMD_RESET (1 << 1) /* controller reset */

/* If this is not defined, assume MX6/MX7/MX8M SoC default */
-#ifndef CONFIG_MXC_USB_PORTSC
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#ifndef CFG_MXC_USB_PORTSC
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif

/* Base address for this IP block is 0x02184800 */
@@ -411,7 +411,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
return 0;

setbits_le32(&ehci->usbmode, CM_HOST);
- writel(CONFIG_MXC_USB_PORTSC, &ehci->portsc);
+ writel(CFG_MXC_USB_PORTSC, &ehci->portsc);
setbits_le32(&ehci->portsc, USB_EN);

mdelay(10);
@@ -454,7 +454,7 @@ static u32 mx6_portsc(enum usb_phy_interface phy_type)
case USBPHY_INTERFACE_MODE_HSIC:
return PORT_PTS_HSIC;
default:
- return CONFIG_MXC_USB_PORTSC;
+ return CFG_MXC_USB_PORTSC;
}
}

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index fd2a0e3d82d3..88505885ca85 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -26,7 +26,7 @@

/* USB Configs */
/* Host */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
/* Client */
#define CONFIG_USBD_HS
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index 19906db5966f..e0f1ec7e11a7 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -415,7 +415,7 @@
/* DMA stuff, needed for GPMI/MXS NAND support */

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

/* UBI support */
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 47a95c0b920a..50aedae8794f 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -84,6 +84,6 @@ BUR_COMMON_ENV \
#define CFG_FEC_FIXED_SPEED _1000BASET

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#endif /* __CONFIG_BRPP2_IMX6_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index e38d2844c803..0a667c60b61b 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -96,7 +96,7 @@
#endif

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

#endif /* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 479feae77240..7d0f2b6dc13a 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -135,7 +135,7 @@
#define CFG_FEC_MXC_PHYADDR 0

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

/* Boot */
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 92dff580f601..7e718b48e423 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -127,7 +127,7 @@

/* USB Configs */

-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 419c919bbecd..b8418373abae 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -23,7 +23,7 @@

/* USB Configs */
/* Host */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 2b2b17f2c7b9..061c445bd9db 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -171,7 +171,7 @@

/* USB Configs */

-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 93ee004b009c..c5781670864b 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -47,7 +47,7 @@
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE

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

#define ENV_MMC \
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 90f8ce0fd57f..db76b458a593 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,7 +32,7 @@

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

/* USB Gadget (DFU, UMS) */
diff --git a/include/configs/display5.h b/include/configs/display5.h
index 9a6fb72377c1..6900baa84545 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -293,5 +293,5 @@
/* The 0x120000 value corresponds to above SPI-NOR memory MAP */
#endif

-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif /* __CONFIG_H */
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index f73b1ec63de6..c7a55c5c9266 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -18,7 +18,7 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)

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

/* MMC Configs */
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index f7e9dd16b26f..dd3c56c480be 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -24,7 +24,7 @@
#endif

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

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index cc21e93a7beb..4741d399590c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,7 +36,7 @@
/* Various command support */

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

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 215ed75deaf3..85c054451f35 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -117,7 +117,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index ca89f72f8a21..6c61b3f44801 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -43,7 +43,7 @@
#define CFG_FEC_MXC_PHYADDR 1

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

/* Falcon */
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 4209d9d7ab28..2c998cdcfc72 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -110,7 +110,7 @@
#endif
#endif

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

#endif /* __IMX6Q_ACC_H */
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 87262a97877e..4202c5928c2f 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -79,7 +79,7 @@

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#define CONFIG_USBD_HS

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 64cdc401d039..2641d7bc960b 100644
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -139,6 +139,6 @@
#define CFG_FEC_MXC_PHYADDR 0

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#endif /*__IMX8MM_CL_IOT_GATE_H*/
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index 3479b0b2bf4d..d0644cd1396b 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -26,7 +26,7 @@
#define CFG_HOSTNAME "kontron-mx6ul"

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

diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index 89f5c6f46faf..8a7709a00b60 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -26,7 +26,7 @@
#define CFG_HOSTNAME "kontron-mx8mm"

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

diff --git a/include/configs/kp_imx53.h b/include/configs/kp_imx53.h
index baf7779026fb..6e383cbe75f7 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -11,7 +11,7 @@
#include <linux/sizes.h>

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 07497d063fb8..1aa4b8ab5987 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -18,7 +18,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 75ff2d9db93c..5811059c8e2b 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -95,7 +95,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index d7b303b6ac05..a54ece9ac828 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -71,8 +71,8 @@
* USB
*/
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORT 1
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT 1
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 9e480fe0558e..6ffc1282411a 100644
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -24,6 +24,6 @@
/* Environment configs */

/* USB configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#endif
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index e82e7547a3f6..dff54d04a678 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -33,8 +33,8 @@
#define CFG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR

/* USB Configs */
-#define CONFIG_MXC_USB_PORT 1
-#define CONFIG_MXC_USB_PORTSC PORT_PTS_ULPI
+#define CFG_MXC_USB_PORT 1
+#define CFG_MXC_USB_PORTSC PORT_PTS_ULPI
#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 5710fe90708a..e995776d30d5 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -23,8 +23,8 @@

/* USB Configs */
-#define CONFIG_MXC_USB_PORT 1
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT 1
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0

/* Command definition */
diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index cd7fa7c8cd96..7398804e6b54 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -17,8 +17,8 @@
#define CFG_SYS_FSL_ESDHC_ADDR 0

/* USB Configs */
-#define CONFIG_MXC_USB_PORT 1
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT 1
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0

/* PMIC Controller */
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 57dffbf6e40c..df65dbeea41c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -12,8 +12,8 @@
#include <asm/arch/imx-regs.h>

/* USB Configs */
-#define CONFIG_MXC_USB_PORT 1
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT 1
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0

/* Command definition */
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 871d52c343f5..f0d6405d3012 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -15,7 +15,7 @@
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

/* USB */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

/* Command definition */

diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index b664962a26a5..f2edd13eb881 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -31,6 +31,6 @@
#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE

-#define CONFIG_MXC_USB_PORTSC PORT_PTS_UTMI
+#define CFG_MXC_USB_PORTSC PORT_PTS_UTMI

#endif /* __CONFIG_H */
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 1d96ecfa46cb..da98139d7d77 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -12,7 +12,7 @@
#define CONSOLE_DEV "ttymxc3"

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 b2266025efcf..2b028e3aa2b1 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -29,7 +29,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 5d5fc8f792de..39c8ef060c7f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -90,7 +90,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/mx6sllevk.h b/include/configs/mx6sllevk.h
index aec3e51bff87..290996b51bc7 100644
--- a/include/configs/mx6sllevk.h
+++ b/include/configs/mx6sllevk.h
@@ -94,7 +94,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif

#include <linux/stringify.h>
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index ff5ef7306611..1c14a6beb0ac 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -96,7 +96,7 @@
#define CFG_FEC_MXC_PHYADDR 0x0

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

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 82dbf0f949c5..8b02c3b63101 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -118,7 +118,7 @@
#define CFG_FEC_MXC_PHYADDR 0x1

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

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 2d26d9b045af..635ae78abcb5 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -116,7 +116,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index a9722967f396..5392f38074ed 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -99,7 +99,7 @@
#endif

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#define CONFIG_USBD_HS

diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h
index 5ee5129801d2..a310c64e7948 100644
--- a/include/configs/mx7ulp_com.h
+++ b/include/configs/mx7ulp_com.h
@@ -51,5 +51,5 @@
#define CFG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CFG_SYS_INIT_RAM_SIZE SZ_256K

-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif /* __CONFIG_H */
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index a8a14600cc2d..2571098d06c6 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -30,7 +30,7 @@
#define CFG_SYS_NAND_BASE 0x40000000

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

#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c634cb203b36..d35650a66e13 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -23,7 +23,7 @@
#define CFG_FEC_MXC_PHYADDR 6

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

#ifdef CONFIG_CMD_MMC
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 6088b2823412..5176c6d1c48c 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -57,7 +57,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
/* Gadget part */
#define CONFIG_USBD_HS
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 490328d516f2..62e74de8aea3 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -31,7 +31,7 @@
#define CFG_SYS_NAND_BASE 0x40000000

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

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/o4-imx6ull-nano.h b/include/configs/o4-imx6ull-nano.h
index 0e1083a2130c..9050da8738b1 100644
--- a/include/configs/o4-imx6ull-nano.h
+++ b/include/configs/o4-imx6ull-nano.h
@@ -12,7 +12,7 @@
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE

#if IS_ENABLED(CONFIG_CMD_USB)
-# define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+# define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif /* CONFIG_CMD_USB */

#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 5587237743c9..cfa708ff5e55 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -20,7 +20,7 @@

/* USB */
#ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index c95507b25fe9..38dcee053596 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -42,7 +42,7 @@
#define CFG_SYS_NAND_BASE 0x40000000

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

#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 688afe674591..d742201ce43b 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -44,7 +44,7 @@
#define CFG_SYS_NAND_BASE 0x40000000

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

#define ENV_MMC \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 473f476aa470..d806d7d9c57d 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -16,7 +16,7 @@
#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 ba37e6765eed..531e462485d8 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -23,7 +23,7 @@
#define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#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 5995ce66ec8b..fd8962e9f751 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -107,7 +107,7 @@
#define CFG_SYS_FSL_USDHC_NUM 2

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

#endif
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 1e3ae0398c1a..041a83b057d4 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -61,7 +61,7 @@

/* USB Configs */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0
#endif

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 61f252cb638c..1e22ecfdc556 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -27,7 +27,7 @@

/* USB */
#ifdef CONFIG_CMD_USB
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#ifdef CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_USBD_HS
#endif /* CONFIG_CMD_USB_MASS_STORAGE */
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index cb5f7fc25af9..af5a474cf31e 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -39,7 +39,7 @@
#define CFG_SYS_FSL_ESDHC_ADDR 0

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#if defined(CONFIG_TQMA6X_MMC_BOOT)

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 8cea69416df2..011a4610474e 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -23,8 +23,8 @@
#define CFG_SYS_FSL_ESDHC_ADDR 0

/* USB */
-#define CONFIG_MXC_USB_PORT 1
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORT 1
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CFG_MXC_USB_FLAGS 0

/* Linux boot */
diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 27d7efb883de..8cb1f1aff353 100644
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -67,6 +67,6 @@
#define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#endif /* __VERDIN_IMX8MM_H */
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 193706e46fa5..6db68c1e7001 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -36,7 +36,7 @@
/* Network */
#define CFG_FEC_MXC_PHYADDR 0x0

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

#ifdef CONFIG_CMD_PCI
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 64dbf93d05d0..7b8c5cbe7a8f 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -17,7 +17,7 @@
#define CFG_SYS_FSL_ESDHC_ADDR 0

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

#define CFG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 709bb046d018..ebc5f4aa6c91 100644
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -93,7 +93,7 @@
#define CFG_SYS_FSL_USDHC_NUM 1

-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

#define CONFIG_USBD_HS

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index c17f0de7ede3..f8ee40a9543b 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -28,7 +28,7 @@
/* Environment is in stored in the eMMC boot partition */

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

#define CFG_FEC_ENET_DEV 0
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7c3c4bca17b7..8fdece74ef1e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -139,8 +139,8 @@ CFG_MXC_NAND_IP_REGS_BASE
CFG_MXC_NAND_REGS_BASE
CFG_MXC_UART_BASE
CFG_MXC_USB_FLAGS
-CONFIG_MXC_USB_PORT
-CONFIG_MXC_USB_PORTSC
+CFG_MXC_USB_PORT
+CFG_MXC_USB_PORTSC
CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC
CONFIG_NAND_CS_INIT
CONFIG_NETDEV
--
2.25.1