kernel: Compile EHCI/OHCI/UHCI support as modules

The USB core will always be compiled into the kernel (because I believe
that we have virtually no systems which won't have a USB bus).

The others will only be loaded when necessary.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-aarch64-generic b/kernel/config-aarch64-generic
index be92c014752a39acaca7dcb12757101449ec3853..862d02662a189e45e41008f1cd0bd1ae51956ef2 100644 (file)
--- a/kernel/config-aarch64-generic
+++ b/kernel/config-aarch64-generic
@@ -1194,7 +1194,12 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # USB Host Controller Drivers
 #
 # CONFIG_USB_XHCI_MVEBU is not set
-CONFIG_USB_EHCI_HCD_ORION=y
+CONFIG_USB_EHCI_HCD_ORION=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_CDNS3_IMX=m
 
 #
 # Platform Glue Layer

diff --git a/kernel/config-generic b/kernel/config-generic
index 5978e18c3257de6e02ff5f95a3f867e82f3e3401..df05f5a2a9c37ebac4c88410079d260f1c9022f4 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -4476,24 +4476,25 @@ CONFIG_USB_MON=m
 #
 # USB Host Controller Drivers
 #
-# CONFIG_USB_C67X00_HCD is not set
-CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=y
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI_RENESAS=m
 CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_PCI=m
 CONFIG_USB_EHCI_FSL=m
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-# CONFIG_USB_OXU210HP_HCD is not set
-# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_FOTG210_HCD=m
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PCI=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_HCD_ISO=y
@@ -4542,7 +4543,13 @@ CONFIG_USB_UAS=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USBIP_CORE is not set
-# CONFIG_USB_CDNS_SUPPORT is not set
+CONFIG_USB_CDNS_SUPPORT=m
+CONFIG_USB_CDNS_HOST=y
+CONFIG_USB_CDNS3=m
+# CONFIG_USB_CDNS3_HOST is not set
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_CDNSP_PCI=m
+CONFIG_USB_CDNSP_HOST=y
 CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_HOST=y
 
@@ -4553,7 +4560,7 @@ CONFIG_USB_MUSB_HOST=y
 #
 # MUSB DMA mode
 #
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_ULPI=y
 CONFIG_USB_DWC3_HOST=y
@@ -4660,7 +4667,7 @@ CONFIG_USB_LCD=m
 # CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
 # CONFIG_USB_ISIGHTFW is not set
@@ -4671,7 +4678,7 @@ CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_LINK_LAYER_TEST=m
 CONFIG_USB_CHAOSKEY=m
-# CONFIG_USB_ONBOARD_HUB is not set
+CONFIG_USB_ONBOARD_HUB=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -4694,21 +4701,24 @@ CONFIG_TYPEC=m
 CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_RT1711H=m
-# CONFIG_TYPEC_TCPCI_MAXIM is not set
+CONFIG_TYPEC_TCPCI_MAXIM=m
 CONFIG_TYPEC_FUSB302=m
-# CONFIG_TYPEC_UCSI is not set
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_UCSI_STM32G0=m
 CONFIG_TYPEC_TPS6598X=m
-# CONFIG_TYPEC_ANX7411 is not set
-# CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_HD3SS3220 is not set
-# CONFIG_TYPEC_STUSB160X is not set
-# CONFIG_TYPEC_WUSB3801 is not set
+CONFIG_TYPEC_ANX7411=m
+CONFIG_TYPEC_RT1719=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+CONFIG_TYPEC_WUSB3801=m
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
 #
-# CONFIG_TYPEC_MUX_FSA4480 is not set
-# CONFIG_TYPEC_MUX_PI3USB30532 is not set
+CONFIG_TYPEC_MUX_FSA4480=m
+CONFIG_TYPEC_MUX_PI3USB30532=m
 # end of USB Type-C Multiplexer/DeMultiplexer Switch support
 
 #
@@ -4718,7 +4728,7 @@ CONFIG_TYPEC_DP_ALTMODE=m
 CONFIG_TYPEC_NVIDIA_ALTMODE=m
 # end of USB Type-C Alternate Mode drivers
 
-CONFIG_USB_ROLE_SWITCH=y
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_MMC=m
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 5815b34b8f4e1cfc4691134490fad7c394789f11..d16f5c43cede6e1326e34d0aa247bc81da35abc1 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 6.0.6
-release    = 0.49
+release    = 0.50
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>