summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug.conf5
-rw-r--r--conf/machine/nokia770.conf2
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index e4b20c0e5f..22e835e257 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -91,9 +91,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
# Select the correct versions of the kernel and modules
-PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
+PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
PREFERRED_VERSION_openslug-kernel ?= "2.6.11.2"
+# The nslu2-kernel version is currently tracking the latest
+# Change before release!
+#PREFERRED_VERSION_nslu2-kernel ?= "2.6.12.2"
PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
PREFERRED_VERSION_ixp425-eth ?= "1.1"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index a228211409..77296e3b8e 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -36,7 +36,7 @@ BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils \
pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils \
-pcmcia-cs apm ppp wireless-tools udev-utils console-tools"
+pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools"
# NFS Modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"