Convert CONFIG_EHCI_HCD_INIT_AFTER_RESET to Kconfig

This converts the following to Kconfig:
   CONFIG_EHCI_HCD_INIT_AFTER_RESET

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 8e0ecc5e41e0d6d958dfdfee04bffaf56503595c..5d0855ffcc7925694366c154b67eb33da02abebf 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -260,9 +260,12 @@ config USB_EHCI_GENERIC
        ---help---
          Enables support for generic EHCI controller.
 
+config EHCI_HCD_INIT_AFTER_RESET
+       bool
+
 config USB_EHCI_FSL
        bool  "Support for FSL on-chip EHCI USB controller"
-       select  CONFIG_EHCI_HCD_INIT_AFTER_RESET
+       select EHCI_HCD_INIT_AFTER_RESET
        ---help---
          Enables support for the on-chip EHCI controller on FSL chips.
 endif # USB_EHCI_HCD

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index d356ff95944d37c26b95713f23c814aed8337d42..01e62668fa52d5034539c924ca67434b316b0c7a 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -307,7 +307,6 @@
  */
 
 #define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 #define CONFIG_NETDEV          "eth1"
 

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index ce63e640d5c6e6bc4aea3c3ff9c8c1143f5986d1..3773b125327c3fe3e233dc5df4cfa5eaaaacebf1 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -492,12 +492,6 @@ extern unsigned long get_sdram_size(void);
 
 #define CONFIG_HAS_FSL_DR_USB
 
-#if defined(CONFIG_HAS_FSL_DR_USB)
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#endif
-#endif
-
 /*
  * Environment
  */

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 9cce6cf68daa71a1dcdbc463eb5c7aed8bf308f6..dfe92bcea0996239be6810e15b938c6c10ff2e28 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -379,10 +379,6 @@
 #define CONFIG_HAS_FSL_DR_USB
 #define CONFIG_HAS_FSL_MPH_USB
 
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#endif
-
 #ifdef CONFIG_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 618b8ed845a1bf4d860fce7f826fecc5354f9bb2..43cf604fdd5c4bbc1aa90ca86fe7509dcf838485 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -401,10 +401,6 @@
  */
 #define CONFIG_HAS_FSL_DR_USB
 
-#ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#endif
-
 /*
  * SDHC
  */

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 3f4e59fa8ab22a7b64cd9039bf28b0f2628a9629..da0a4f206ef539909ea40e799fcfe7a315e47921 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -405,12 +405,6 @@
 */
 #define CONFIG_HAS_FSL_DR_USB
 
-#ifdef CONFIG_HAS_FSL_DR_USB
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#endif
-#endif
-
 #ifdef CONFIG_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index b4a91eacb9e09b5dcbecc2432ab6789329f94e15..dfe9192df128f047e7a6ee898b23e05fb4e7f914 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -475,7 +475,6 @@
  * USB
  */
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_HAS_FSL_DR_USB
 #endif
 

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 84e5d5df38dfc18db8f659a6c3a6d6ba26c9a811..a5a30d8c8555f563bbe79c63c9678d5960fb368e 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -431,7 +431,6 @@
  * USB
  */
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_HAS_FSL_DR_USB
 #endif
 

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 2ab1b647a86bfb454aea6fb531cfde52e3862e7c..7690bee484595513ac5a80f258aede63e6d25894 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -448,7 +448,6 @@
 /*
 * USB
 */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_HAS_FSL_DR_USB
 
 #ifdef CONFIG_MMC

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 28644051471328138fcdd3b6d92434f761956a60..d0e0e65d85f9b75ab43779e113f99684c0666fc3 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -38,7 +38,6 @@
 /* USB Configs */
 /* Host */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 /* Client */

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index de4f4407abb8bba83ba6fb3ae59fd93c32eb65fd..0c44f7483bdb0718645fbc6fc0cb9f45ce6ebf3a 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -420,7 +420,6 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 

diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 7b110f05ca448c117ddb17afa3dec897b0db40bc..19276cc6ecab319e7a96be57c378e787f55166fd 100644 (file)
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -86,7 +86,6 @@ BUR_COMMON_ENV \
 #define CONFIG_FEC_FIXED_SPEED         _1000BASET
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 /* SPL */

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index b19b3ef541c77706ee9eb90c0b65eaf02b07e63f..c63c5ebb672e1ed01419bc7d461d5161e9ed71ac 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -102,7 +102,6 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index cb4cd925d9fd97e38693bb75b0d7feab15b6ad0e..07ad6fde28d00e43a0e67bed3564dfb464d4d0ae 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -148,7 +148,6 @@
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 
 /* SATA */
 #define CONFIG_LBA48

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index 0459cb0286e3eb755bc8a2684ccc96cbd1175f42..da5b8a6f80fa2f6f342db02ae0ad3b1dd902e8a7 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -135,7 +135,6 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index d7d5c2ddee159b65568e959aa88633ac5d8e5571..f62a3f6688ed13e1aa938c12f19550c6f4a04fb3 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -28,7 +28,6 @@
 /* USB Configs */
 /* Host */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 /* Client */

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 180142a6487909ffa10468b1c242869c7938f842..d78a27347c563fd078e7d935c2b73c6597384a3b 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -179,7 +179,6 @@
 #endif
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index 32e2aabc67c7bc02dbc3647cea33778a63c20342..664c538f6dcd7187b4d440dbc8b333c09e4b38d8 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -98,7 +98,6 @@
 
 /* USB Host Support */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
 /* USB DFU */
 

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 9291b81ac2a695d1ea6379218d31caa7e3bf9a0d..54e79b16d6539ae5b5647d9dcd436b9aef283cad 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -377,10 +377,6 @@
 #define CONFIG_HAS_FSL_DR_USB
 #define CONFIG_HAS_FSL_MPH_USB
 
-#if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#endif
-
 #ifdef CONFIG_MMC
 #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT

diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index d502e98deae72cd2f5422d6b3f87aebdc14b409a..9f27072f12ff37dffc21b4ff3720bd6f30b4c214 100644 (file)
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       IRAM_SIZE
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index b495826301e7a33b2e22bbbb3e8bb23ea70d13ee..298a88c92edac67ed1baec7b00e40503f77e1349 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -41,7 +41,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2 /* Enabled USB controller number */

diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index ed46f26628f1b11b5ce227593a5b8dfaf6afb41f..26a714c2886b0256499903f56534ef9ba3ec6f0e 100644 (file)
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -22,10 +22,6 @@
 
 /* UART */
 
-/* Fixup - in init code we switch from device to host mode,
- * it has to be done after each HCD reset */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 1) \

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 00996f5cb784e3d305519dbe7a4d152f2c866c74..7526d3b0f515c1c66308fec45496fbfa5e915be5 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -18,7 +18,6 @@
 #define PHYS_SDRAM_SIZE                (1u * 1024 * 1024 * 1024)
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 

diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 252ab5e7473d1e6c69a33064c8d68b66a656b320..61ca5f8b34ab3d53a02e5991f5f377f39d846928 100644 (file)
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -29,7 +29,6 @@
 #endif
 
 /* USB */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 26d171daae7debeca7ac6560c32d447e14645f96..6aa6c6262e3f0e51ea4c252bf84e126ed406c02f 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -55,7 +55,6 @@
 /* Various command support */
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET  /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC     (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS      0
 #define CONFIG_USBD_HS

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 592c62ab8acc4f4946f96f25c00dba1d5d55b148..6b1c67867da0f6b873accacbc109c59c9d408d3a 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -122,7 +122,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1 /* Enabled USB controller number */

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index c4eebb5aeac02204ec9037f09efd4b06915e9acb..2707ae6440679c1c9602e9f80deb1b23a962b102 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -45,7 +45,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         1
 
 /* USB */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC                  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS                   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2

diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 785ac7c50148ea4fcef56830532ce089a0731d0a..e904a10b6e86bc75f9eb131253c6a524d0ea3eb3 100644 (file)
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -111,7 +111,6 @@
 #endif
 #endif
 
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC            (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS             0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT  1     /* Enabled USB controller number */

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 7135a83e0422fc0314622bb8c7808f3940776ffd..9b84730fc765c9ce6ad84df9ec1beff744d349ed 100644 (file)
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -141,7 +141,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         0
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 

diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index b6e68f8f41acb3787ebffeb3a7a381ffb4de302a..d04684955d3c30cdde9045192bfd957add64fbaf 100644 (file)
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -29,7 +29,6 @@
 #define CONFIG_HOSTNAME                        "kontron-mx6ul"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h
index c4be62c3721cfff5a91ba5992a8e83243cdb652a..e28bfb88ff07b7196b00dffadaf9633e5e23811f 100644 (file)
--- a/include/configs/kontron-sl-mx8mm.h
+++ b/include/configs/kontron-sl-mx8mm.h
@@ -26,7 +26,6 @@
 #define CONFIG_HOSTNAME                        "kontron-mx8mm"
 
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 5b25be5c92545539f3136a518699b952f58d6381..a513213c5980a95d74c2709dfdd3247678e07fe1 100644 (file)
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -21,7 +21,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2 /* Enabled USB controller number */

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 3c03368b5c0aa24b20fa33742b46a3b1cae91257..fa178fbe9365fc5b3787f03b997249e471ffc611 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -98,7 +98,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1

diff --git a/include/configs/meerkat96.h b/include/configs/meerkat96.h
index 0ccfe7db5a4df801b94760f70e29480cb01c826c..c6ce8837474e66be395d40c2ff262dcbc17ccb80 100644 (file)
--- a/include/configs/meerkat96.h
+++ b/include/configs/meerkat96.h
@@ -24,7 +24,6 @@
 /* Environment configs */
 
 /* USB configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 
 #endif

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index d120c7c7a352e0db76224f675cf1a29fa615a92d..d0cf6a2251c3dc0e96775fdab89024800895f2dd 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -17,7 +17,6 @@
 
 /* USB Configs */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 2f4332a4b19f5d2d3641f076ba0bc53bbd464788..18d5d4988cf4e6c9a2fc2364bb976f2717c37c12 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -36,7 +36,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1 /* Enabled USB controller number */

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index e03226d4180ab8a160b06bbe0b3aefa510fdfd93..837742b8039c98e3b3d69b0fe4af80f8c189009b 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -94,7 +94,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 272492466de99a1644ba00c34db2d378e2af1b20..b3a786da4801fafc969eaff49b05adfc9ddba59c 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -97,7 +97,6 @@
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index fda5b03b60f6703c6dbbc6782a2ff45e84a875bf..a5596d98fe6845dfa8afa425b4dc1ce75c21b970 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -124,7 +124,6 @@
 #define CONFIG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 44e6fd0156fab9e742ceab4f2c59d99d7c63633d..7c76290a2aeb812e40317fe6d391a211660bd2f7 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -119,7 +119,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index fb685ec9631c5a16bc687500555d1fa5bdb50ca8..d1dc445a9b733f8d8766509a9b4ae1ea7f753e8c 100644 (file)
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_NAND_BASE           0x40000000
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 3aa21a28d155a5a9c67165fe81f003d264c0790c..72f2dfb5daca502e9395c072fe4f2cc7e3c6fd50 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -33,7 +33,6 @@
 
 /* USB Configs */
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 1fc4b87cab7435a5a7470d49480e0f030c656f06..b3de41852fede48812b5b35ff5ceb412fc9c7a71 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -35,7 +35,6 @@
 #define CONFIG_SYS_NAND_BASE           0x40000000
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 75e84c35ee064393ec9d6b1ac5f6733fd3794c39..cce5556fe266d13a6b9196cfe191d784bd5baff3 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -40,9 +40,6 @@
 #define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
 
-/* USB UHH support options */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-
 /* Enabled commands */
 
 /* USB Networking options */

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 8624d24b6eaadb36f73a979be7911431c90c3556..ebfba72d0da458a9be19e00caec8b6333857e4c1 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -24,7 +24,6 @@
 
 /* USB */
 #ifdef CONFIG_USB_EHCI_MX6
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 56a16502dcc736cb4ab797edae175093b33ba8d2..033f5b0c7b004f6e69792b60585b613be3b0be71 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -458,12 +458,6 @@
  */
 #define CONFIG_HAS_FSL_DR_USB
 
-#if defined(CONFIG_HAS_FSL_DR_USB)
-#ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#endif
-#endif
-
 #if defined(CONFIG_TARGET_P1020RDB_PD)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif

diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index 659f20e63abb93fc5709316731ce82125c8439d0..c6c417b6292a3b8e49d609268cce79be72bc49ce 100644 (file)
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -46,7 +46,6 @@
 #define CONFIG_SYS_NAND_BASE           0x40000000
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1

diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 0d099fa14c2d4ab45d1e79d4b467850161fdb37a..4c1d24f64fd5e73eacc75b77209a194d7e8ae3b3 100644 (file)
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -48,7 +48,6 @@
 #define CONFIG_SYS_NAND_BASE           0x40000000
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index ea30fbc4cfcca69712b1b19b5ed764408510120b..7e57d7b14222eb757335897a956380a8d0b48928 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -30,7 +30,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 5a6f22442014be7c4fbb3e3350b40808526092a4..39705d95692f0756d9f1c7f082b019b07875a6e5 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -116,7 +116,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM               2
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC                  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS                   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2

diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index f1886cb214599d6b0709eed873af227a1dcc97a1..e7a12799d99570f839108e7ab9a4b50a66f0c107 100644 (file)
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -65,7 +65,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index c355083519f3b04040a059250afbfeb277c0bfce..22a7407a4697123550364b792373d50a0281290f 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -41,7 +41,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #ifdef CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USBD_HS

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 3290ec021fd98246e01b2e55d3426bb28a14d009..d60fe51eaf98058a24ff7ad9a40f859aad56b18e 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -53,8 +53,6 @@
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
-
 
 #if defined(CONFIG_TQMA6X_MMC_BOOT)
 

diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h
index 19c16df488874edbe6bafa8bb940c429606ccf30..0867ccad0a270a56814366ef8136550639c495e7 100644 (file)
--- a/include/configs/verdin-imx8mm.h
+++ b/include/configs/verdin-imx8mm.h
@@ -75,7 +75,6 @@
 #define CONFIG_FEC_MXC_PHYADDR          7
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index a447ec8c3446656a19e6432db0dc1e476f25e668..487ab3d664cc506d8f72a4e3518eeb0a4c916d48 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -41,7 +41,6 @@
 /* Network */
 #define CONFIG_FEC_MXC_PHYADDR          0x0
 
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/warp.h b/include/configs/warp.h
index 74fa03b53d82d420a8c425d154738c5eac8e6bb8..5716f8f9a600a25c256a33c9c13f4717c10c15b8 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -34,7 +34,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1 /* Only OTG2 port enabled */

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 8e36d1c4c3e0438832f2ea4a8a09a3066f94850b..81f8d64067dc3053646f144559fa89c0604cc148 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -31,7 +31,6 @@
 /* Environment is in stored in the eMMC boot partition */
 
 /* USB Configs */
-#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2