Browse Source

usb: ehci: Convert CONFIG_USB_EHCI_PCI to Kconfig

This converts CONFIG_USB_EHCI_PCI to a Kconfig option, and updates
all boards that use it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Bin Meng 7 years ago
parent
commit
a11a5b8ad9

+ 1 - 0
configs/MPC8544DS_defconfig

@@ -28,5 +28,6 @@ CONFIG_RTL8139=y
 CONFIG_SCSI=y
 CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/MPC8572DS_36BIT_defconfig

@@ -27,5 +27,6 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/MPC8572DS_defconfig

@@ -26,5 +26,6 @@ CONFIG_PHY_GIGE=y
 CONFIG_E1000=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_PCI=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_LIBFDT=y

+ 6 - 0
drivers/usb/host/Kconfig

@@ -142,6 +142,12 @@ config USB_EHCI_MSM
 	  This driver supports combination of Chipidea USB controller
 	  This driver supports combination of Chipidea USB controller
 	  and Synapsys USB PHY in host mode only.
 	  and Synapsys USB PHY in host mode only.
 
 
+config USB_EHCI_PCI
+	bool "Support for PCI-based EHCI USB controller"
+	default y if X86
+	help
+	  Enables support for the PCI-based EHCI controller.
+
 config USB_EHCI_RCAR_GEN3
 config USB_EHCI_RCAR_GEN3
 	bool "Support for Renesas RCar M3/H3 EHCI USB controller"
 	bool "Support for Renesas RCar M3/H3 EHCI USB controller"
 	depends on RCAR_GEN3
 	depends on RCAR_GEN3

+ 0 - 1
include/configs/MPC8544DS.h

@@ -347,7 +347,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  */
  */
 
 
 #ifdef CONFIG_USB_EHCI_HCD
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_PCI
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_PCI_EHCI_DEVICE			0
 #define CONFIG_PCI_EHCI_DEVICE			0
 #endif
 #endif

+ 0 - 1
include/configs/MPC8572DS.h

@@ -545,7 +545,6 @@
  */
  */
 
 
 #ifdef CONFIG_USB_EHCI_HCD
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_PCI
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_PCI_EHCI_DEVICE			0
 #define CONFIG_PCI_EHCI_DEVICE			0
 #endif
 #endif

+ 0 - 1
include/configs/efi-x86.h

@@ -12,7 +12,6 @@
 #undef CONFIG_TPM_TIS_BASE_ADDRESS
 #undef CONFIG_TPM_TIS_BASE_ADDRESS
 
 
 #undef CONFIG_SCSI_AHCI
 #undef CONFIG_SCSI_AHCI
-#undef CONFIG_USB_EHCI_PCI
 
 
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
 #define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
 					"stdout=vga,serial\0" \
 					"stdout=vga,serial\0" \

+ 0 - 1
include/configs/x86-common.h

@@ -118,7 +118,6 @@
 /*-----------------------------------------------------------------------
 /*-----------------------------------------------------------------------
  * USB configuration
  * USB configuration
  */
  */
-#define CONFIG_USB_EHCI_PCI
 #define CONFIG_SYS_USB_EVENT_POLL
 #define CONFIG_SYS_USB_EVENT_POLL
 
 
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_HOST_ETHER

+ 0 - 1
scripts/config_whitelist.txt

@@ -5026,7 +5026,6 @@ CONFIG_USB_EHCI_KIRKWOOD
 CONFIG_USB_EHCI_MX5
 CONFIG_USB_EHCI_MX5
 CONFIG_USB_EHCI_MXC
 CONFIG_USB_EHCI_MXC
 CONFIG_USB_EHCI_MXS
 CONFIG_USB_EHCI_MXS
-CONFIG_USB_EHCI_PCI
 CONFIG_USB_EHCI_RMOBILE
 CONFIG_USB_EHCI_RMOBILE
 CONFIG_USB_EHCI_SPEAR
 CONFIG_USB_EHCI_SPEAR
 CONFIG_USB_EHCI_SUNXI
 CONFIG_USB_EHCI_SUNXI