Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit a11a5b8ad9d7bfd37e7abbbaecc536f86eabc2d2

Authored by Bin Meng
Committed by Marek Vasut
1 parent 2d7cb5b426
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 9 changed files with 9 additions and 5 deletions Side-by-side Diff

configs/MPC8544DS_defconfig
Diff comments   View file @ a11a5b8
... ... @@ -28,6 +28,7 @@
28 28 CONFIG_SCSI=y
29 29 CONFIG_SYS_NS16550=y
30 30 CONFIG_USB=y
  31 +CONFIG_USB_EHCI_PCI=y
31 32 CONFIG_USB_STORAGE=y
32 33 CONFIG_OF_LIBFDT=y
configs/MPC8572DS_36BIT_defconfig
Diff comments   View file @ a11a5b8
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_E1000=y
28 28 CONFIG_SYS_NS16550=y
29 29 CONFIG_USB=y
  30 +CONFIG_USB_EHCI_PCI=y
30 31 CONFIG_USB_STORAGE=y
31 32 CONFIG_OF_LIBFDT=y
configs/MPC8572DS_defconfig
Diff comments   View file @ a11a5b8
... ... @@ -26,6 +26,7 @@
26 26 CONFIG_E1000=y
27 27 CONFIG_SYS_NS16550=y
28 28 CONFIG_USB=y
  29 +CONFIG_USB_EHCI_PCI=y
29 30 CONFIG_USB_STORAGE=y
30 31 CONFIG_OF_LIBFDT=y
drivers/usb/host/Kconfig
Diff comments   View file @ a11a5b8
... ... @@ -142,6 +142,12 @@
142 142 This driver supports combination of Chipidea USB controller
143 143 and Synapsys USB PHY in host mode only.
144 144  
  145 +config USB_EHCI_PCI
  146 + bool "Support for PCI-based EHCI USB controller"
  147 + default y if X86
  148 + help
  149 + Enables support for the PCI-based EHCI controller.
  150 +
145 151 config USB_EHCI_RCAR_GEN3
146 152 bool "Support for Renesas RCar M3/H3 EHCI USB controller"
147 153 depends on RCAR_GEN3
include/configs/MPC8544DS.h
Diff comments   View file @ a11a5b8
... ... @@ -347,7 +347,6 @@
347 347 */
348 348  
349 349 #ifdef CONFIG_USB_EHCI_HCD
350   -#define CONFIG_USB_EHCI_PCI
351 350 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
352 351 #define CONFIG_PCI_EHCI_DEVICE 0
353 352 #endif
include/configs/MPC8572DS.h
Diff comments   View file @ a11a5b8
... ... @@ -545,7 +545,6 @@
545 545 */
546 546  
547 547 #ifdef CONFIG_USB_EHCI_HCD
548   -#define CONFIG_USB_EHCI_PCI
549 548 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
550 549 #define CONFIG_PCI_EHCI_DEVICE 0
551 550 #endif
include/configs/efi-x86.h
Diff comments   View file @ a11a5b8
... ... @@ -12,7 +12,6 @@
12 12 #undef CONFIG_TPM_TIS_BASE_ADDRESS
13 13  
14 14 #undef CONFIG_SCSI_AHCI
15   -#undef CONFIG_USB_EHCI_PCI
16 15  
17 16 #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
18 17 "stdout=vga,serial\0" \
include/configs/x86-common.h
Diff comments   View file @ a11a5b8
... ... @@ -118,7 +118,6 @@
118 118 /*-----------------------------------------------------------------------
119 119 * USB configuration
120 120 */
121   -#define CONFIG_USB_EHCI_PCI
122 121 #define CONFIG_SYS_USB_EVENT_POLL
123 122  
124 123 #define CONFIG_USB_HOST_ETHER
scripts/config_whitelist.txt
Diff comments   View file @ a11a5b8
... ... @@ -5026,7 +5026,6 @@
5026 5026 CONFIG_USB_EHCI_MX5
5027 5027 CONFIG_USB_EHCI_MXC
5028 5028 CONFIG_USB_EHCI_MXS
5029   -CONFIG_USB_EHCI_PCI
5030 5029 CONFIG_USB_EHCI_RMOBILE
5031 5030 CONFIG_USB_EHCI_SPEAR
5032 5031 CONFIG_USB_EHCI_SUNXI