From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 19 Dec 2007 03:18:13 +0000 (+0000)
Subject: Remove the MACHINE_ARCH override for nslu2be and nslu2le, to enable proper multimachi... 
X-Git-Tag: Release-2010-05/1~8136^2~5^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1a282eefccb30efaff4877307aa09506fe19297;p=openembedded.git

Remove the MACHINE_ARCH override for nslu2be and nslu2le, to enable proper multimachine support for nslu2 and ixp4xx together in the same build tree.
---

diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 3162eb3342..360e397e04 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -6,8 +6,6 @@ TARGET_ARCH = "armeb"
 
 PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
 
-MACHINE_ARCH = "ixp4xxbe"
-
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ROOT_FLASH_SIZE ?= "6"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 1aced19de2..1ad9bdd96a 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -6,8 +6,6 @@ TARGET_ARCH = "arm"
 
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
-MACHINE_ARCH = "ixp4xxle"
-
 OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
 ROOT_FLASH_SIZE ?= "6"