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 964a53bb7c0ed8a048802fd0fd83364e76a72c34..c11279867c7ca0d2412d9cea5105763419729df3 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 fa2ca2a1d9128b2826c21e2a041e030c68dad202..0a12db614ff44d3b9c81a49d9294f92968cd0618 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 2fb4cfa5e9a119b6175be3aa621fc9b410697f16..8a9f3ef75a7dd0108d1be0a8bb11b8881105777c 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 be1478ea8b67af031028ae7674f1dc65b27a109b..286435d6f84cf6a505853236a12ac1ff94a460da 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 32d9f503d9f025c92336b8192bfd0fe3336fd0d7..38c98c5e21c4585a821302bc8a74edfeb4efcc25 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 b7920c7b3057447d4044052913ca193e069a25ee..0a667c60b61ba90dcf92a288499ad9964e985eee 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 90ebec4a94ca18e94e36983273478ecf933029ea..7d0f2b6dc13a9c77e0a363e7b3fe5673c18eaf9d 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 5b802aa92a9cfc74c83336f8813c5270b9311e41..ba45ee4efd37879f205aca599370773116e07fec 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 3c67aab04c1c461ad627144859e5d7025fa776a1..4b2841833b5a697d7568c963305637c94de60ae3 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 91f87ea283fe70d8a29efd7d81fb9c3b14319611..c568643977ca3e0009f18580c1384a5333905cd7 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 fb619105a7601e2adb6e6b43c7f3c733aa808045..c5781670864b3f12775a7ffb00ba50e033694d13 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 348be5a6ec64deb8f750c5dc9bc87eccf638315b..5cf73274d5e16ffafb21f84681a7f00f8031e6bb 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 cd1544be039fee555e57aed12814ff3d4c855a13..3b96fff7d6f81ded88c0c99225a3fae901f676de 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 81a92c9bb971ac3c5614270003ce14ee695d9dc8..31c7e104f6b893a7e078c09ec63ec6bc1922f399 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 529b8fc53e5779616dd2a82e71c9be2d73724e81..49b058cb10d4bf86195e2b42b289c68c19cf0ead 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 c6ace9d65eb3d7e68d1b4ca781fec3791232b9e3..0a9dfe736f7d8731e984ebbce8c284d50e820890 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 f9544cd430caf5814eac8b5d54d9581e0284758d..85c054451f35cb22affbacfb51ef12700fdbbe8d 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 db08e43f0d864f9ddada020b6e21c2efafb4bda2..6c61b3f4480125aa5122e950d10dacd42b0af4f8 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 e28185f24dd3e22a6ece84bbb36ae0c864426b1b..2c998cdcfc726ea802d5f36b24ad186bed839e90 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 84fb1bfb7598af915a28e7bf9bf0cb5c0dab1b29..106fbdb9053c4694a2bdc11fa1a6fac7c4f5a3ca 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 64cdc401d039b29ff633f4b49c38c4f21dc2befb..2641d7bc960b7edb75bcb8d533ae254b69be6d30 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 4354f3945e8367660cb963dfa9cf9140cb1c075a..1c92cd787677b80289e9b92b9239649859a627d0 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 d80238bd02f2c8ae29b80a0fcba0215939cf7906..eee3d2ddb037c30adcb92d84c70c2e9f640c501e 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 da8a67b4ab63740129f572c8952e1f6e6c91fff2..6e383cbe75f78faa3f86bd44a5eb4194f97f4dd1 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 99321b320f5f8dc328b0013f7b1c42867a43c361..1aa4b8ab5987cfc12030e6e185134ba2a5a84bb4 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 63e5dbfab7750b362b648680ba853c899b4f4e0b..5811059c8e2bef1abb312c1570673e52b9bac1bb 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 9aac5677fb75039659590932fa18b81822b76d37..1ecbba1b58ff867e7c0975d80ae8da37831a6e69 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 9e480fe0558e30414687d15fdaf0f281d481afc2..6ffc1282411aaffb3d38210139552e5e4cc038ad 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 123b7a533b17622c18ab0bc4e9241948eeeb2108..dff54d04a6783d0799f80078504cfd13a4a185b5 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 1a3ec6e0cdb8f653403b99820d7ff144488c977e..e995776d30d5e2aafda41df25b44b1c6abb58386 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 d87f9e942c51a052e635178ab8e2e41b459f03cd..7398804e6b546c201df29f172c387d90fcb164d8 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 94d2191af91dc7d2e4ab7b3e13d19361025b4c25..df65dbeea41c8db54abd4096d13527b315fe5a03 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 871d52c343f53115f2be4abb2842c925be53c9e4..f0d6405d3012394c4c6fdcae398505a1481f07b6 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 b664962a26a50784e31dd3ede7fe4b1aba6593f0..f2edd13eb8816a3341df6990a6d4939b03e8d489 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 274c14bbd3830c9d2e008ab348b5457c1f58a935..da98139d7d77397cf609d84b1401b5b206854555 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 af9978e02c8939df238d6991358d1fd737885dbc..2b028e3aa2b164f02dd74dfe0317583c0a5e69a5 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 f6d9ac20821f8128b59e6412cce2ee7a244dcf8d..39c8ef060c7fac8db9957d2be3f0b38f096b97cb 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 aec3e51bff8768877855f7ea8c6f00fc35ad5285..290996b51bc75394a5ab71b9f15fd25370e7ba54 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 3d0f6e452d65bb88eadf2689bf6fda4a188905d9..1c14a6beb0ac61f59f135ea3ef46b0ccac64323c 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 8c39e6d6cf4dc8114c293934760a8695150dcda0..8b02c3b63101ead8214f019c1bd58079cdf74555 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 3f8a90b626d10771c68c89d173262973d7671e42..635ae78abcb5c2ada9747b50f87bceaefda1ea4b 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 9c938f04e93c91dba27b486c4e66efd36a2689a0..94bee75fdea5a9fb8b580be9d1ffea57f0f18de2 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 5ee5129801d207a15efcaf370ad5f0586656c934..a310c64e794864f7b73ac012da3af89d6a534b4d 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 0c0235b42984eab3bfd3a20555dad8017eac40bc..2571098d06c6e8a96c8dfd3a6ea21b46c77b9396 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 5625771bad14f397f2bb80318d97d6d8d41e56c7..c9c599d07621d126d822254c3f962c522a0fa82b 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 7243549b68d819defec84e228d8fe5b6a8b86b45..dc5b043129053d8041cdcdd97b647808ac56c3f1 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 24d7b0c26e860e7c1b5090e79ff227a99c46969e..5f933391cc01019b406cfaaa730dbdabab12792f 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 0e1083a2130c401413aaa6f1d7b4df6b8175f51a..9050da8738b17d188930bb50c4be1b0638d8cf40 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 459134b93f8396f32c711992578abf3d424be25a..1edb1826c4e856cc9d8f2b98c0368cfd899388d0 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 e8c48cf83652d2b292cd6ce1e4ebdcff1f881499..38dcee053596e0e725fe6274614340ad8851d11b 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 bd04268a3ef39891a0c3f3a68adad26d18d8770d..d742201ce43b06514ba712faec99e4a31ff60e4b 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 a1d0dd93c5268df109ccd3728c2e3e45b1b797f6..d806d7d9c57d4e489cb1b6c875a1dd8a55bd1c33 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 64e0a5564810faefe854240dc3c75b47c72934bb..4caa823375831215d95c6fcd31be66b2cd0aa255 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 dbeaeea77f7de5c6293c156ba511b6724c447eb5..fd8962e9f7518414280ff238752f279adea39b62 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 3418d4e2b55972964d0640ec89d237e0903c186a..041a83b057d4e8e4f89f32a64649dd0e42837905 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 9b396e6e73b0d384fbfe42868bbbcfd199a77321..535859792d3b747aac32d1c6adb590067fecdb76 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 cb5f7fc25af98962a857488ee2ef4a268b75a0de..af5a474cf31e1e797845c3b2e6d65e962875373c 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 00b45cc3d2ad3b0c89505bebf6b3b6f25fb553ae..27e61f5b8f46b614cdbc0f3caa5a6a913bee1db1 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 27d7efb883de4f5f4c2741eac92ba76f42986679..8cb1f1aff353217812fda07f962ffcf253a91ec9 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 7954ed9910c779793dd1d6a63b054510330b40d9..6db68c1e7001448651f4b0e47c741128974e7211 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 8853bcd7be284e9e531717185a120ae184ef4ada..7b8c5cbe7a8f83f6b458944752217937fdc6a09b 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 0826e0bbe0258183425cfbd30e56a4add2d1db49..5d2956a5963c9bcbd7e6dc5a014ee72434c0f223 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 c8ae047e62c368748dab88f8fefd4b34e0570bb3..a2aa31008ec98bc9356fe5c039a0154e782d6217 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