aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2019-02-15 11:03:14 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2019-02-17 19:22:39 +0100
commit5d11672d077a14b9c44f3d3c35dd16a6c3af3566 (patch)
treededeafe7351bb44d6ec29f907265445c80b784c1
parentcd1e9c88f339b582a77c5d08b11d3483e90f4d69 (diff)
downloadupstream-5d11672d077a14b9c44f3d3c35dd16a6c3af3566.tar.gz
upstream-5d11672d077a14b9c44f3d3c35dd16a6c3af3566.tar.bz2
upstream-5d11672d077a14b9c44f3d3c35dd16a6c3af3566.zip
kernel: disable CONFIG_USB_IMX21_HCD in default for kernel 4.14
CONFIG_USB_IMX21_HCD should be handled in generic config and module package. So moved it into generic config. This also fixed build issue (kernel config question) of layerscape armv8_32b since it also used ARCH_MXC. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> [Deactivate CONFIG_USB_IMX21_HCD also for kernel 4.19] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/generic/config-4.141
-rw-r--r--target/linux/generic/config-4.191
-rw-r--r--target/linux/imx6/config-4.141
3 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index e90d8bf930..8fd0d469fd 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -5204,6 +5204,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
# CONFIG_USB_HUB_USB251XB is not set
# CONFIG_USB_HWA_HCD is not set
# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IMX21_HCD is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_IPHETH is not set
# CONFIG_USB_ISIGHTFW is not set
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index 4992007d67..343ee86619 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -5459,6 +5459,7 @@ CONFIG_USB_GADGET_VBUS_DRAW=2
# CONFIG_USB_HUB_USB251XB is not set
# CONFIG_USB_HWA_HCD is not set
# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IMX21_HCD is not set
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_IPHETH is not set
# CONFIG_USB_ISIGHTFW is not set
diff --git a/target/linux/imx6/config-4.14 b/target/linux/imx6/config-4.14
index 2b87e0d545..587cd7522a 100644
--- a/target/linux/imx6/config-4.14
+++ b/target/linux/imx6/config-4.14
@@ -500,7 +500,6 @@ CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
# CONFIG_USB_EHCI_MXC is not set
CONFIG_USB_GADGET=y
-# CONFIG_USB_IMX21_HCD is not set
CONFIG_USB_MXS_PHY=y
CONFIG_USB_OTG=y
CONFIG_USB_PHY=y