On 2016-02-22, Ben Hutchings wrote:
> We need to either exclude the USB-attached MMC host controllers from
> mmc-modules:
>
> ushc -
> vub300 -
That still needed more exclusions; I didn't track them all down...
> or make mmc-modules depend on usb-modules.
Adding usb-modules dependency worked better, or at least, didn't FTBFS.
With a couple more changes (there were some phy-usb modules missing),
the patch below adds the additional modules needed for rockchip and a
few others. Tried adding wildcards for the regulator modules, but was
unsuccessful. Checked the result against a debdiff of mmc-modules,
usb-modules and core-modules:
usb-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/phy/phy-rockchip-usb.ko
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-1726-] {+1732+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~3+}
core-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/regulator/act8865-regulator.ko
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-396-] {+417+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~3+}
mmc-modules
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mfd/rtsx_pci.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mfd/rtsx_usb.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/misc/cb710/cb710.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/cb710-mmc.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/dw_mmc-rockchip.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/mvsdio.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/omap.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/rtsx_usb_sdmmc.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/ushc.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/via-sdmmc.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/vub300.ko
-rw-r--r-- root/root /lib/modules/4.4.0-1-armmp/kernel/drivers/mmc/host/wmt-sdmmc.ko
Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: kernel-image-4.4.0-1-armmp-di, [-core-modules-4.4.0-1-armmp-di-] {+core-modules-4.4.0-1-armmp-di, usb-modules-4.4.0-1-armmp-di+}
Installed-Size: [-403-] {+768+}
Version: [-4.4.2-3-] {+4.4.2-4~20160223~3+}
diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 7ea5f6d..3128393 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,6 +14,7 @@ phy-omap-control ?
phy-ti-pipe3 ?
# Regulators
+act8865-regulator ?
anatop-regulator ?
axp20x-regulator ?
da9052-regulator ?
diff --git a/debian/installer/armhf/modules/armhf-armmp/mmc-modules b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
index 287ff3f..dadfd53 100644
--- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules
@@ -1,8 +1 @@
#include <mmc-modules>
-sdhci-esdhc-imx
-sdhci-tegra
-mmci
-omap_hsmmc
-sunxi-mmc
-dw_mmc-exynos
-sdhci-bcm2835
diff --git a/debian/installer/armhf/modules/armhf-armmp/usb-modules b/debian/installer/armhf/modules/armhf-armmp/usb-modules
index 663e915..7861c82 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -9,17 +9,3 @@ ehci-orion
ehci-tegra
ci_hdrc_imx
dwc2
-
-# USB PHYs
-phy-am335x ?
-phy-am335x-control ?
-phy-exynos-usb2
-phy-exynos5-usbdrd ?
-phy-generic ?
-phy-mxs-usb
-phy-omap-usb2
-phy-sun4i-usb
-phy-sun9i-usb ?
-phy-tegra-usb ?
-phy-twl4030-usb ?
-phy-twl6030-usb ?
diff --git a/debian/installer/modules/mmc-modules b/debian/installer/modules/mmc-modules
index ce8b176..0bae54e 100644
--- a/debian/installer/modules/mmc-modules
+++ b/debian/installer/modules/mmc-modules
@@ -7,3 +7,4 @@ tifm_sd ?
dw_mmc ?
dw_mmc_pltfm ?
toshsd ?
+drivers/mmc/host/**
diff --git a/debian/installer/modules/usb-modules b/debian/installer/modules/usb-modules
index 3198f10..7e87f81 100644
--- a/debian/installer/modules/usb-modules
+++ b/debian/installer/modules/usb-modules
@@ -7,3 +7,7 @@ sl811_cs -
sl811-hcd -
u132-hcd -
whci-hcd -
+
+# Include USB PHY drivers by default
+drivers/phy/phy-*-usb* ?
+drivers/usb/phy/* ?
diff --git a/debian/installer/package-list b/debian/installer/package-list
index 74dfeb1..f51c443 100644
--- a/debian/installer/package-list
+++ b/debian/installer/package-list
@@ -300,7 +300,7 @@ Description: MMC/SD/SDIO core modules
This package contains core modules for MMC/SD/SDIO support.
Package: mmc-modules
-Depends: kernel-image, core-modules, mmc-core-modules
+Depends: kernel-image, core-modules, mmc-core-modules, usb-modules
Priority: extra
Description: MMC/SD card modules
This package contains modules needed to support MMC (multimedia) and
Attachment:
signature.asc
Description: PGP signature