From 5d11672d077a14b9c44f3d3c35dd16a6c3af3566 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 15 Feb 2019 11:03:14 +0800 Subject: [PATCH] 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 [Deactivate CONFIG_USB_IMX21_HCD also for kernel 4.19] Signed-off-by: Hauke Mehrtens --- target/linux/generic/config-4.14 | 1 + target/linux/generic/config-4.19 | 1 + target/linux/imx6/config-4.14 | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index e90d8bf93070..8fd0d469fd7d 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 4992007d673b..343ee866199d 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 2b87e0d5459d..587cd7522a00 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 -- 2.30.2