summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-12-04 09:26:26 +0000
committerJustin M. Forbes <jforbes@fedoraproject.org>2019-12-05 10:38:31 -0600
commit503760b7c9ae34bb92d23b841cc12558cce40c90 (patch)
tree2351bb6939cbaa37976e39bc489f57881c58dc53
parent6b45f47575b44ead23d61138c8f080fbb9f81f80 (diff)
downloadkernel-503760b7c9ae34bb92d23b841cc12558cce40c90.tar.gz
kernel-503760b7c9ae34bb92d23b841cc12558cce40c90.tar.xz
kernel-503760b7c9ae34bb92d23b841cc12558cce40c90.zip
arm: we need EHCI to load before ohci/uhci so put it back to built in on arm
-rw-r--r--configs/fedora/generic/arm/CONFIG_USB_EHCI_HCD1
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
7 files changed, 6 insertions, 7 deletions
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