[PATCH 091/149] global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

Tom Rini
2022-12-04T15:23:03Z

Perform simple renames of:
CONFIG_MXC_USB_FLAGS to CFG_MXC_USB_FLAGS
CONFIG_MXC_USB_PORT to CFG_MXC_USB_PORT
CONFIG_MXC_USB_PORTSC to CFG_MXC_USB_PORTSC

Signed-off-by: Tom Rini <trini@konsulko.com>
---
drivers/usb/host/ehci-mx5.c | 4 ++--
drivers/usb/host/ehci-mx6.c | 8 ++++----
include/configs/apalis_imx6.h | 4 ++--
include/configs/aristainetos2.h | 4 ++--
include/configs/brppt2.h | 2 +-
include/configs/cl-som-imx7.h | 4 ++--
include/configs/cm_fx6.h | 4 ++--
include/configs/colibri-imx6ull.h | 4 ++--
include/configs/colibri_imx6.h | 4 ++--
include/configs/colibri_imx7.h | 4 ++--
include/configs/dart_6ul.h | 4 ++--
include/configs/dh_imx6.h | 4 ++--
include/configs/display5.h | 2 +-
include/configs/embestmx6boards.h | 4 ++--
include/configs/ge_b1x5v2.h | 4 ++--
include/configs/gw_ventana.h | 4 ++--
include/configs/imx6_logic.h | 4 ++--
include/configs/imx6dl-mamoj.h | 4 ++--
include/configs/imx6q-bosch-acc.h | 4 ++--
include/configs/imx7-cm.h | 2 +-
include/configs/imx8mm-cl-iot-gate.h | 2 +-
include/configs/kontron-sl-mx6ul.h | 4 ++--
include/configs/kontron-sl-mx8mm.h | 4 ++--
include/configs/kp_imx53.h | 4 ++--
include/configs/kp_imx6q_tpc.h | 4 ++--
include/configs/liteboard.h | 4 ++--
include/configs/m53menlo.h | 6 +++---
include/configs/meerkat96.h | 2 +-
include/configs/mx51evk.h | 6 +++---
include/configs/mx53cx9020.h | 6 +++---
include/configs/mx53loco.h | 6 +++---
include/configs/mx53ppd.h | 6 +++---
include/configs/mx6cuboxi.h | 2 +-
include/configs/mx6memcal.h | 2 +-
include/configs/mx6sabreauto.h | 4 ++--
include/configs/mx6sabresd.h | 4 ++--
include/configs/mx6slevk.h | 4 ++--
include/configs/mx6sllevk.h | 2 +-
include/configs/mx6sxsabreauto.h | 4 ++--
include/configs/mx6sxsabresd.h | 4 ++--
include/configs/mx6ul_14x14_evk.h | 4 ++--
include/configs/mx7dsabresd.h | 2 +-
include/configs/mx7ulp_com.h | 2 +-
include/configs/mys_6ulx.h | 4 ++--
include/configs/nitrogen6x.h | 4 ++--
include/configs/novena.h | 4 ++--
include/configs/npi_imx6ull.h | 4 ++--
include/configs/o4-imx6ull-nano.h | 2 +-
include/configs/opos6uldev.h | 4 ++--
include/configs/pcl063.h | 4 ++--
include/configs/pcl063_ull.h | 4 ++--
include/configs/pico-imx6.h | 4 ++--
include/configs/pico-imx6ul.h | 4 ++--
include/configs/pico-imx7d.h | 4 ++--
include/configs/somlabs_visionsom_6ull.h | 4 ++--
include/configs/tbs2910.h | 2 +-
include/configs/tqma6.h | 2 +-
include/configs/usbarmory.h | 6 +++---
include/configs/verdin-imx8mm.h | 2 +-
include/configs/vining_2000.h | 4 ++--
include/configs/wandboard.h | 4 ++--
include/configs/warp7.h | 2 +-
include/configs/xpress.h | 4 ++--
63 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 964a53bb7c0e..c11279867c7c 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -299,10 +299,10 @@ 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, 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/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 2fb4cfa5e9a1..8a9f3ef75a7d 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -26,8 +26,8 @@

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

/* Framebuffer and LCD */

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index be1478ea8b67..286435d6f84c 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -413,8 +413,8 @@
/* DMA stuff, needed for GPMI/MXS NAND support */

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#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 32d9f503d9f0..38c98c5e21c4 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -79,6 +79,6 @@ BUR_COMMON_ENV \
#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)

#endif /* __CONFIG_BRPP2_IMX6_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b7920c7b3057..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 CONFIG_MXC_USB_FLAGS 0
+#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 90ebec4a94ca..7d0f2b6dc13a 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -135,8 +135,8 @@
#define CFG_FEC_MXC_PHYADDR 0

/* USB */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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 5b802aa92a9c..ba45ee4efd37 100644
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -123,8 +123,8 @@

/* USB Configs */

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

/* USB Device Firmware Update support */
#define DFU_DEFAULT_POLL_TIMEOUT 300
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 3c67aab04c1c..4b2841833b5a 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -23,8 +23,8 @@

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

/* Command definition */

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 91f87ea283fe..c568643977ca 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -167,7 +167,7 @@

/* USB Configs */

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

#endif
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index fb619105a760..c5781670864b 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -47,8 +47,8 @@
#define CFG_SYS_INIT_RAM_SIZE IRAM_SIZE

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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 348be5a6ec64..5cf73274d5e1 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -32,8 +32,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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/display5.h b/include/configs/display5.h
index cd1544be039f..3b96fff7d6f8 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -288,5 +288,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 81a92c9bb971..31c7e104f6b8 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -18,8 +18,8 @@
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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 529b8fc53e57..49b058cb10d4 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -24,8 +24,8 @@
#endif

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

/* Memory */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index c6ace9d65eb3..0a9dfe736f7d 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -36,8 +36,8 @@
/* Various command support */

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

/* Miscellaneous configurable options */

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index f9544cd430ca..85c054451f35 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -117,8 +117,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..6c61b3f44801 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -43,8 +43,8 @@
#define CFG_FEC_MXC_PHYADDR 1

/* USB */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#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 e28185f24dd3..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 CONFIG_MXC_USB_FLAGS 0
+#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 84fb1bfb7598..106fbdb9053c 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -79,6 +79,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)

#endif /* __CONFIG_H */
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 4354f3945e83..1c92cd787677 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -25,8 +25,8 @@
#define CFG_MXC_UART_BASE UART4_BASE

#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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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 d80238bd02f2..eee3d2ddb037 100644
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -25,8 +25,8 @@
/* Board and environment settings */

#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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..6e383cbe75f7 100644
--- a/include/configs/kp_imx53.h
+++ b/include/configs/kp_imx53.h
@@ -11,8 +11,8 @@
#include <linux/sizes.h>

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

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..5811059c8e2b 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -95,8 +95,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 9aac5677fb75..1ecbba1b58ff 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -70,9 +70,9 @@
* USB
*/
#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_PORT 1
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

/* LVDS display */
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 123b7a533b17..dff54d04a678 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -33,9 +33,9 @@
#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 CONFIG_MXC_USB_FLAGS MXC_EHCI_POWER_PINS_ENABLED
+#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 1a3ec6e0cdb8..e995776d30d5 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -23,9 +23,9 @@

/* 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_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 d87f9e942c51..7398804e6b54 100644
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -17,9 +17,9 @@
#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 CONFIG_MXC_USB_FLAGS 0
+#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 */
#define CFG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 94d2191af91d..df65dbeea41c 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -12,9 +12,9 @@
#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 CONFIG_MXC_USB_FLAGS 0
+#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 274c14bbd383..da98139d7d77 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -12,8 +12,8 @@
#define CONSOLE_DEV "ttymxc3"

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

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..39c8ef060c7f 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -90,8 +90,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

#define CFG_SYS_FSL_USDHC_NUM 3
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 3d0f6e452d65..1c14a6beb0ac 100644
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -96,8 +96,8 @@
#define CFG_FEC_MXC_PHYADDR 0x0

#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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..8b02c3b63101 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -118,8 +118,8 @@
#define CFG_FEC_MXC_PHYADDR 0x1

#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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..635ae78abcb5 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -116,8 +116,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 9c938f04e93c..94bee75fdea5 100644
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -99,6 +99,6 @@
#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)

#endif /* __CONFIG_H */
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 0c0235b42984..2571098d06c6 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -30,8 +30,8 @@
#define CFG_SYS_NAND_BASE 0x40000000

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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 5625771bad14..c9c599d07621 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -21,8 +21,8 @@
#define CFG_FEC_MXC_PHYADDR 6

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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 7243549b68d8..dc5b04312905 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -53,8 +53,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

/* Extra U-Boot environment. */
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 24d7b0c26e86..5f933391cc01 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -29,8 +29,8 @@
#define CFG_SYS_NAND_BASE 0x40000000

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

#ifdef CONFIG_CMD_NET
#define CFG_FEC_MXC_PHYADDR 0x1
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 459134b93f83..1edb1826c4e8 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -19,8 +19,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

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

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..d742201ce43b 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -44,8 +44,8 @@
#define CFG_SYS_NAND_BASE 0x40000000

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#define CFG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..d806d7d9c57d 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -16,8 +16,8 @@
#define CFG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#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 64e0a5564810..4caa82337583 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -23,8 +23,8 @@
#define CFG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR

/* USB Configs */
-#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-#define CONFIG_MXC_USB_FLAGS 0
+#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-imx7d.h b/include/configs/pico-imx7d.h
index dbeaeea77f7d..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 CONFIG_MXC_USB_FLAGS 0
+#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 3418d4e2b559..041a83b057d4 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -61,8 +61,8 @@

/* 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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CFG_MXC_USB_FLAGS 0
#endif

#ifdef CONFIG_CMD_NET
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 9b396e6e73b0..535859792d3b 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)
#endif /* CONFIG_CMD_USB */

#define CFG_EXTRA_ENV_SETTINGS \
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 00b45cc3d2ad..27e61f5b8f46 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -23,9 +23,9 @@
#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 CONFIG_MXC_USB_FLAGS 0
+#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 7954ed9910c7..6db68c1e7001 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -36,8 +36,8 @@
/* Network */
#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_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#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..7b8c5cbe7a8f 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -17,8 +17,8 @@
#define CFG_SYS_FSL_ESDHC_ADDR 0

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

#define CFG_EXTRA_ENV_SETTINGS \
"console=ttymxc0\0" \
diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 0826e0bbe025..5d2956a5963c 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)

/* USB Device Firmware Update support */
#define DFU_DEFAULT_POLL_TIMEOUT 300
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index c8ae047e62c3..a2aa31008ec9 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -28,8 +28,8 @@
/* Environment is in stored in the eMMC boot partition */

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

#define CFG_FEC_ENET_DEV 0
#define CFG_FEC_MXC_PHYADDR 0x0
--
2.25.1