From 6cfdb6c860a3f71cad3be8ef47c8a2b96742d8c7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 4 Dec 2019 09:26:26 +0000 Subject: [PATCH] arm: we need EHCI to load before ohci/uhci so put it back to built in on arm --- configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD | 1 - kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD diff --git a/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD b/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD deleted file mode 100644 index a2df656e0..000000000 --- a/configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD +++ /dev/null @@ -1 +0,0 @@ -CONFIG_USB_EHCI_HCD=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index b9399957c..972f9e1f4 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6779,9 +6779,9 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_FSL=m -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_MXC is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TEGRA=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 2ef5739c3..af794b59a 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6757,9 +6757,9 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_FSL=m -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_MXC is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TEGRA=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index cd6471c53..a9e4d13ec 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7019,11 +7019,11 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_EXYNOS=m # CONFIG_USB_EHCI_FSL is not set -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_STI=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MV=m # CONFIG_USB_EHCI_MV_U2O is not set CONFIG_USB_EHCI_MXC=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index ebb7f3498..331629e52 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6998,11 +6998,11 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_EXYNOS=m # CONFIG_USB_EHCI_FSL is not set -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_OMAP=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_EHCI_HCD_STI=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_MV=m # CONFIG_USB_EHCI_MV_U2O is not set CONFIG_USB_EHCI_MXC=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index cd7f22e38..cdf8b66a9 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6688,9 +6688,9 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_EXYNOS=m # CONFIG_USB_EHCI_FSL is not set -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_TT_NEWSCHED=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 6e866f023..e2b0c9086 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6667,9 +6667,9 @@ CONFIG_USB_DWC3_ULPI=y # CONFIG_USB_EG20T is not set CONFIG_USB_EHCI_EXYNOS=m # CONFIG_USB_EHCI_FSL is not set -CONFIG_USB_EHCI_HCD=m CONFIG_USB_EHCI_HCD_ORION=m CONFIG_USB_EHCI_HCD_PLATFORM=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TEGRA=m CONFIG_USB_EHCI_TT_NEWSCHED=y