3 files changed, 51 insertions, 7 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index da80210b8f..ed39440661 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -87,6 +87,31 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+# Add modules required for firmware loading
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-firmware-class \
+"
+
+# Add module to create i2c chardev
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-i2c-dev \
+"
+
+# Add module required for HW RNG support
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ixp4xx-rng \
+"
+
+# Add modules required for usb support
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-usbcore \
+kernel-module-ohci-hcd \
+kernel-module-ehci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-scsi-mod \
+kernel-module-usb-storage \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 5e7947f866..3993bf6ec0 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -170,13 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.17"
-
-# Built-in ethernet modules
-PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
-PREFERRED_VERSION_ixp4xx-csr ?= "2.1"
-PREFERRED_VERSION_ixp-osal ?= "2.1"
-PREFERRED_VERSION_ixp400-eth ?= "1.5"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.18"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 6af761e26e..7c8039b6da 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -87,6 +87,31 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+# Add modules required for firmware loading
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-firmware-class \
+"
+
+# Add module to create i2c chardev
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-i2c-dev \
+"
+
+# Add module required for HW RNG support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ixp4xx-rng \
+"
+
+# Add modules required for usb support
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-usbcore \
+kernel-module-ohci-hcd \
+kernel-module-ehci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-scsi-mod \
+kernel-module-usb-storage \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #