usb: host: Move CONFIG_XHCI_FSL to Kconfig

use Kconfig to select xhci accordingly.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index f5f19ed775c219017abd96e65721da0f7701e326..5264475fa521bf91c075d866b28ed7b88236663e 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -71,6 +71,12 @@ config USB_XHCI_DRA7XX_INDEX
          Select the DRA7XX xHCI USB index.
          Current supported values: 0, 1.
 
+config USB_XHCI_FSL
+       bool "Support for NXP Layerscape on-chip xHCI USB controller"
+       default y if ARCH_LS1021A || FSL_LSCH3 || FSL_LSCH2
+       depends on !SPL_NO_USB
+       help
+         Enables support for the on-chip xHCI controller on NXP Layerscape SoCs.
 endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD

diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h
index 2e5af9cc4e22586f47557dfd188c31c93b96ccea..2e9c619bd52d41526e04d94b8b4b97bb80ced1a4 100644 (file)
--- a/include/configs/ls1012afrdm.h
+++ b/include/configs/ls1012afrdm.h
@@ -34,7 +34,6 @@
 /*
 * USB
 */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 
 #define CONFIG_CMD_MEMINFO

diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h
index e0949d0b53d81c9bca490070489a7e3547ed51a5..70bf72c431477a6c3236f2f856298907e621d854 100644 (file)
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -119,7 +119,6 @@
 #endif
 
 /*XHCI Support - enabled by default*/
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 
 /*  MMC  */

diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h
index 66ff0043848afe5426b2f9238baadeeb643a5ccb..110fcc63238d427ebbca7a525874b61507510b71 100644 (file)
--- a/include/configs/ls1012ardb.h
+++ b/include/configs/ls1012ardb.h
@@ -22,7 +22,6 @@
 /*
 * USB
 */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 
 /*

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 02bfbd0a7db66217645276a1291e1fd61d2cc325..7c7f82f215afa540933b55c2007e3e266638114d 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -20,7 +20,6 @@
 #define CONFIG_SYS_INIT_RAM_SIZE       OCRAM_SIZE
 
 /* XHCI Support - enabled by default */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                1
 
 #define CONFIG_SYS_CLK_FREQ            100000000

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 0046ded536f21f6d1fddb053304ba3dfd017dc80..8346e3658f014ae05f289df820b58c579d4a7a2b 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -405,7 +405,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 /*XHCI Support - enabled by default*/
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                1
 
 /*

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 0172c9015d3ff0c950d276382e4611ad4a159d93..8ccc81642d60836c59137d7a512001e23c084283 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -45,7 +45,6 @@
 #endif
 
 /* XHCI Support - enabled by default */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 
 #define CONFIG_SYS_CLK_FREQ            100000000

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index 607c289d17950452d4cc07f7681808e7e62863af..641ffc1400e22cc03513658e1ddb2c3cd2e85a80 100644 (file)
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -371,7 +371,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 /* USB */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                3
 
 /*

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 34be9960c16d7d78032ad73cdd25786336f1dc00..489f50c5b131a438380d02863ab508ac20d55c58 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -286,7 +286,6 @@
 
 /* USB */
 #ifndef SPL_NO_USB
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                3
 #endif
 

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index b0d41b401e8c966ac9b06da994414b769ff8797f..7778f86881b4679193423d6140c281fe41442fc5 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -137,7 +137,6 @@ unsigned long get_board_ddr_clk(void);
 #endif
 
 /* USB */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         3
 
 /* SATA */

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 32b08d8229aa3065f1fabff57d79257196a852d6..40ce8ff4623b3df3da83ae2d75e40eff47318ab3 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -211,7 +211,6 @@
 
 /* USB */
 #ifndef SPL_NO_USB
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         3
 #endif
 

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index d594cc10687125e66b48c89e371b47c7e1271b60..5dd1ff206544ea5cc5f0c8cac660e8037caaef07 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -438,7 +438,6 @@ unsigned long get_board_ddr_clk(void);
 /*
  * USB
  */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT                2
 
 #include <asm/fsl_secure_boot.h>

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index c368a56657229c67c8f9c115af24ca256cd901ff..eef78f21b6366164ef2aa8f990028d04b49d1e3a 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -336,7 +336,6 @@ unsigned long get_board_sys_clk(void);
 /*
  * USB
  */
-#define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         2
 
 #undef CONFIG_CMDLINE_EDITING

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 76267495bed2e9531845da7ec66bc14aa2c94120..776c116669dfa281a9414afc38e320f2517e9a48 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -5026,7 +5026,6 @@ CONFIG_USB_TTY
 CONFIG_USB_TUSB_OMAP_DMA
 CONFIG_USB_ULPI_TIMEOUT
 CONFIG_USB_XHCI_EXYNOS
-CONFIG_USB_XHCI_FSL
 CONFIG_USB_XHCI_KEYSTONE
 CONFIG_USB_XHCI_OMAP
 CONFIG_USER_LOWLEVEL_INIT