From 563df542c0cdc1ee923e2771854916145b07f43d Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 20 Jul 2020 19:36:54 +0000 Subject: [PATCH] ANDROID: db845c_gki.fragment: Remove modules built into GKI The CONFIG_USB_EHCI_HCD and CONFIG_USB_EHCI_HCD_PLATFORM values were moved into the gki_defconfig, so continuing to build them as modules causes the resulting kernel to not boot. This patch simply removes them. Also drop the "CONFIG_USB_DUMMY_HCD is not set" override, as its not doing anything other then causing warning on build. Fixes: 953a6e32250d9 ("ANDROID: GKI: support CONFIG_USB_EHCI_HCD_PLATFORM") Fixes: bdb20ce7a0419 ("ANDROID: GKI: support CONFIG_USB_EHCI_HCD") Signed-off-by: John Stultz Change-Id: Ie53f6a1fb0c1a3c4ff6eef76c6b648600cdc7b2c --- arch/arm64/configs/db845c_gki.fragment | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment index bc22e4d6ae3a..8a713a4b2de3 100644 --- a/arch/arm64/configs/db845c_gki.fragment +++ b/arch/arm64/configs/db845c_gki.fragment @@ -29,8 +29,6 @@ CONFIG_DRM_MSM=m CONFIG_DRM_LONTIUM_LT9611=m CONFIG_USB_XHCI_PCI_RENESAS=m CONFIG_USB_XHCI_HCD=m -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_DWC3=m @@ -38,7 +36,6 @@ CONFIG_USB_DWC3_DISABLE_GADGET_SG=y # CONFIG_USB_DWC3_HAPS is not set # CONFIG_USB_DWC3_OF_SIMPLE is not set CONFIG_USB_GADGET_VBUS_DRAW=500 -# CONFIG_USB_DUMMY_HCD is not set CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_ULPI_BUS=m CONFIG_MMC_SDHCI_MSM=m