Clean up IPKG_ARCHS - do not include the little endian armv5te,

include the lines from tune-xscale.conf (not previously included).

BKrev: 42b21dc6zd6h7BkvSxU5NDwx7GwHog

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 2bbd77f..38ca474 100644 (file)
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -3,13 +3,21 @@
 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
 
 TARGET_ARCH = "armeb"
-IPKG_ARCHS = "all ${TARGET_ARCH} armv5te ${MACHINE}"
+# NOTE: this used to contain armv5te, but any package marked
+# armv5te is almost certain to be little endian and all NSLU2
+# packages (openslug and unslung) are generated 'armeb', so
+# this list accepts only armeb or nslu2
+IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
 IMAGE_ROOTFS_SIZE_ext2 = "10240"
 IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
 
-include tune-xscale.conf
+# This was 'include tune-xscale.conf' but that doesn't work
+# (it would need to be conf/machine/tune-xscale.conf) and
+# anyway it sets the package architecture to armeb.
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_ARCH = "armeb"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"