From 503760b7c9ae34bb92d23b841cc12558cce40c90 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 4 Dec 2019 09:26:26 +0000 Subject: 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 d6706a037..167933e16 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6698,9 +6698,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 71568fc8a..0574ba3e3 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6676,9 +6676,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 08c34c836..ca2ef034c 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6949,11 +6949,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 3440ad0a8..f00f13893 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6928,11 +6928,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 01e72756a..59de8d9c7 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6618,9 +6618,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 093af1efa..c9454cd33 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6597,9 +6597,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 -- cgit