global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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>

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index 964a53b..c112798 100644 (file)
--- 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 fa2ca2a..0a12db6 100644 (file)
--- 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 2fb4cfa..8a9f3ef 100644 (file)
--- 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 be1478e..286435d 100644 (file)
--- 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 32d9f50..38c98c5 100644 (file)
--- 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 b7920c7..0a667c6 100644 (file)
--- 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 90ebec4..7d0f2b6 100644 (file)
--- 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 5b802aa..ba45ee4 100644 (file)
--- 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 3c67aab..4b28418 100644 (file)
--- 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 91f87ea..c568643 100644 (file)
--- 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 fb61910..c578167 100644 (file)
--- 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 348be5a..5cf7327 100644 (file)
--- 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 cd1544b..3b96fff 100644 (file)
--- 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 81a92c9..31c7e10 100644 (file)
--- 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 529b8fc..49b058c 100644 (file)
--- 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 c6ace9d..0a9dfe7 100644 (file)
--- 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 f9544cd..85c0544 100644 (file)
--- 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 db08e43..6c61b3f 100644 (file)
--- 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 e28185f..2c998cd 100644 (file)
--- 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 84fb1bf..106fbdb 100644 (file)
--- 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 64cdc40..2641d7b 100644 (file)
--- 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 4354f39..1c92cd7 100644 (file)
--- 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 d80238b..eee3d2d 100644 (file)
--- 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 da8a67b..6e383cb 100644 (file)
--- 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 99321b3..1aa4b8a 100644 (file)
--- 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 63e5dbf..5811059 100644 (file)
--- 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 9aac567..1ecbba1 100644 (file)
--- 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 9e480fe..6ffc128 100644 (file)
--- 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 123b7a5..dff54d0 100644 (file)
--- 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 1a3ec6e..e995776 100644 (file)
--- 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 d87f9e9..7398804 100644 (file)
--- 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 94d2191..df65dbe 100644 (file)
--- 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 871d52c..f0d6405 100644 (file)
--- 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 b664962..f2edd13 100644 (file)
--- 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 274c14b..da98139 100644 (file)
--- 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 af9978e..2b028e3 100644 (file)
--- 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 f6d9ac2..39c8ef0 100644 (file)
--- 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 aec3e51..290996b 100644 (file)
--- 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 3d0f6e4..1c14a6b 100644 (file)
--- 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 8c39e6d..8b02c3b 100644 (file)
--- 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 3f8a90b..635ae78 100644 (file)
--- 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 9c938f0..94bee75 100644 (file)
--- 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 5ee5129..a310c64 100644 (file)
--- 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 0c0235b..2571098 100644 (file)
--- 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 5625771..c9c599d 100644 (file)
--- 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 7243549..dc5b043 100644 (file)
--- 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 24d7b0c..5f93339 100644 (file)
--- 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 0e1083a..9050da8 100644 (file)
--- 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 459134b..1edb182 100644 (file)
--- 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 e8c48cf..38dcee0 100644 (file)
--- 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 bd04268..d742201 100644 (file)
--- 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 a1d0dd9..d806d7d 100644 (file)
--- 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 64e0a55..4caa823 100644 (file)
--- 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 dbeaeea..fd8962e 100644 (file)
--- 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 3418d4e..041a83b 100644 (file)
--- 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 9b396e6..5358597 100644 (file)
--- 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 cb5f7fc..af5a474 100644 (file)
--- 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 00b45cc..27e61f5 100644 (file)
--- 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 27d7efb..8cb1f1a 100644 (file)
--- 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 7954ed9..6db68c1 100644 (file)
--- 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 8853bcd..7b8c5cb 100644 (file)
--- 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 0826e0b..5d2956a 100644 (file)
--- 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 c8ae047..a2aa310 100644 (file)
--- 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