On 2016-02-21, Ben Hutchings wrote: > On Sun, 2016-02-21 at 16:11 -0800, Vagrant Cascadian wrote: >> On 2016-02-21, Ben Hutchings wrote: >> > > --- a/debian/installer/armhf/modules/armhf-armmp/mmc-modules >> > > +++ b/debian/installer/armhf/modules/armhf-armmp/mmc-modules >> > > @@ -5,4 +5,5 @@ mmci >> > > omap_hsmmc >> > > sunxi-mmc >> > > dw_mmc-exynos >> > > +dw_mmc-rockchip >> > > sdhci-bcm2835 >> > >> > Would it make sense to replace this list with a wildcard in the default >> > mmc-modules file: >> > >> > drivers/mmc/host/** >> >> Overall, I like the idea of using wildcards to include enabled drivers >> by default, so that drivers for new platforms get automatically >> included. ... > Please can you test whether that change would do the right thing for armhf.
First attempt resulted in:
kernel-wedge find-dups 4.4.0-1-armmp
some modules are in more than one package
debian/usb-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/common/usb-common.ko
debian/mmc-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/common/usb-common.ko
debian/usb-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/core/usbcore.ko
debian/mmc-modules-4.4.0-1-armmp-di
lib/modules/4.4.0-1-armmp/kernel/drivers/usb/core/usbcore.ko
command exited with status 1
make[2]: *** [install-udeb_armhf] Error 2
debian/rules.real:449: recipe for target 'install-udeb_armhf' failed
That was using the following patch:
diff --git a/debian/installer/armhf/modules/armhf-armmp/core-modules
b/debian/installer/armhf/modules/armhf-armmp/core-modules
index 7ea5f6d..4c26273 100644
--- a/debian/installer/armhf/modules/armhf-armmp/core-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/core-modules
@@ -14,16 +14,8 @@ phy-omap-control ?
phy-ti-pipe3 ?
# Regulators
-anatop-regulator ?
-axp20x-regulator ?
-da9052-regulator ?
-gpio-regulator ?
-mc13783-regulator ?
-mc13892-regulator ?
-pbias-regulator
-pfuze100-regulator ?
+drivers/regulators/*-regulator ?
s2mpa01 ?
s2mps11 ?
s5m8767 ?
-ti-abb-regulator ?
vexpress ?
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..2e14200 100644
--- a/debian/installer/armhf/modules/armhf-armmp/usb-modules
+++ b/debian/installer/armhf/modules/armhf-armmp/usb-modules
@@ -10,16 +10,4 @@ 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 ?
+# USB PHYs included in usb-modules
diff --git a/debian/installer/modules/mmc-modules
b/debian/installer/modules/mmc-modules
index ce8b176..4367117 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/**
\ No newline at end of file
diff --git a/debian/installer/modules/usb-modules
b/debian/installer/modules/usb-modules
index 3198f10..af92252 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/* ?
live well,
vagrant
signature.asc
Description: PGP signature
