openslug-init(modprobe.conf),nslu2.conf: generate the correct ixp-eth alias, support le

modprobe.conf is now machine generated to use the PROVIDER of virtual/ixp-eth
in place of a hard code module name - PREFERRED_PROVIDER_virtual/ixp-eth must
be specified to make this work, the configuration files have been updated
appropriate.  openslug-image now pulls in virtual/ixp-eth, not a specific
provider and uses the PREFERRED_PROVIDER of that module as the RDEPENDS.
nslu2.conf and ucslugc.conf have changes to support configuration of the build
endianness correctly - not fully functional because the flash read code still
needs word swapping on LE.

1 files changed, 34 insertions, 10 deletions

diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index c4db50c1e3..fee0c0f9af 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -10,12 +10,21 @@ DISTRO_VERSION = "3-beta"
 DISTRO_FEED = "unstable"
 DISTRO_TYPE ?= "beta"
 
+# Overridable settings
+#DANGER: overriding any of these builds something very different from the base
+# usclugc!
+UCSLUGC_OS ?= "linux-uclibc"
+UCSLUGC_INTERWORK ?= ":thumb-interwork"
+UCSLUGC_INSTRUCTION_SET ?= ":thumb"
+UCSLUGC_ARCH_TYPE ?= "b"
+
+# Target OS - uclibc or glibc(linux)
 TARGET_FPU = "soft"
-TARGET_OS = "linux-uclibc"
+TARGET_OS = "${UCSLUGC_OS}"
 
-# Select thumb-interwork and (TBD) thumb
-ARM_INTERWORK = ":thumb-interwork"
-ARM_INSTRUCTION_SET = ":thumb"
+# Select thumb-interwork and thumb
+ARM_INTERWORK = "${UCSLUGC_INTERWORK}"
+ARM_INSTRUCTION_SET = "${UCSLUGC_INSTRUCTION_SET}"
 
 USE_NLS ?= "no"
 USE_NLS_glib-2.0 = "yes"
@@ -26,6 +35,11 @@ INHERIT += " package_ipk debian"
 # present (ucslugc overrides take precedence).
 NSLU2_BASE_DISTRO = ":openslug"
 
+# The standard arch is big-endian - "b", set to "l" for a little-endian
+# build
+NSLU2_ARCH_TYPE = "${UCSLUGC_ARCH_TYPE}"
+TARGET_ARCH = "${@['arm', 'armeb'][bb.data.getVar('UCSLUGC_ARCH_TYPE', d, 1) == 'b']}"
+
 # We are building packages which are armvteb (big endian) for arm or thumbv5tb for
 # thumb instructions.  The PACKAGE_ARCH should reflect this because generated code
 # requires that instruction set support.
@@ -129,18 +143,28 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-# Select the smallest provider of x11 libraries
-PREFERRED_PROVIDER_x11 ?= "diet-x11"
-CVSDATE_diet-xll ?= "20050930"
+# compiler/binary/library versions (unslung uses different ones so these
+# cannot be in nslu2.conf)
+PREFERRED_VERSION_binutils ?= "2.16"
+PREFERRED_VERSION_binutils-cross ?= "2.16"
+PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
+PREFERRED_VERSION_gcc-cross ?= "3.4.4"
+PREFERRED_VERSION_gcc ?= "3.4.4"
+PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc2"
+PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc3"
 
+PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp425-eth"
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
 PREFERRED_VERSION_ixp425-eth ?= "1.1"
+PREFERRED_VERSION_ixp-osal ?= "2.0"
+PREFERRED_VERSION_ixp400-eth ?= "1.4"
 
-PREFERRED_VERSION_samba ?= "3.0.14a"
+# Select the smallest provider of x11 libraries
+PREFERRED_PROVIDER_x11 ?= "diet-x11"
+CVSDATE_diet-x11 ?= "20051005"
 
-PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29"
+PREFERRED_VERSION_samba ?= "3.0.14a"