5 files changed, 6 insertions, 31 deletions
diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 0b333e2f01..0bcdac1db5 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -86,26 +86,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-# Add module to create i2c chardev
+# Add daemon required for HW RNG support
 DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-i2c-dev \
-"
-
-# Add module & daemon required for HW RNG support
-DEBIANSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ixp4xx-rng \
 rng-tools \
 "
 
 # 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-sd-mod \
-kernel-module-usb-storage \
 "
 
 # Add modules required for IDE support
diff --git a/conf/distro/include/ludeos-packages.inc b/conf/distro/include/ludeos-packages.inc
deleted file mode 100644
index f88d593a17..0000000000
--- a/conf/distro/include/ludeos-packages.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SLUGOS_EXTRA_BBFILES = ""
-require conf/distro/include/slugos-packages.conf
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 55a6942a4f..dec16d8cd7 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -86,26 +86,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
-# Add module to create i2c chardev
+# Add daemon required for HW RNG support
 OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-i2c-dev \
-"
-
-# Add module & daemon required for HW RNG support
-OPENSLUG_STANDARD_RDEPENDS += "\
-kernel-module-ixp4xx-rng \
 rng-tools \
 "
 
 # 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-sd-mod \
-kernel-module-usb-storage \
 "
 
 # Add modules required for IDE support
diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf
index dc174b8e35..6d7fd11a05 100644
--- a/conf/machine/ixp4xx.conf
+++ b/conf/machine/ixp4xx.conf
@@ -7,3 +7,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2"
 include conf/machine/include/ixp4xx.conf
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 --faketime -n"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
deleted file mode 100644
index 29a3b04f5f..0000000000
--- a/conf/machine/nas100d.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Iomega NAS 100d
-#@DESCRIPTION: Machine configuration for the Iomega NAS 100d product
-
-include conf/machine/include/ixp4xx.conf