summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-12-19 03:18:13 +0000
committerRod Whitby <rod@whitby.id.au>2007-12-19 03:18:13 +0000
commitb1a282eefccb30efaff4877307aa09506fe19297 (patch)
tree5c4e4d1093ee20d0dc62b41631074e97b01b2525 /conf
parent68859ee6009620f7386a7651ae0fccc3bace6113 (diff)
Remove the MACHINE_ARCH override for nslu2be and nslu2le, to enable proper multimachine support for nslu2 and ixp4xx together in the same build tree.
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/nslu2be.conf2
-rw-r--r--conf/machine/nslu2le.conf2
2 files changed, 0 insertions, 4 deletions
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"