summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/nslu2be.conf5
-rw-r--r--conf/machine/nslu2le.conf5
2 files changed, 4 insertions, 6 deletions
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 16d1ed8508..3ca3baf952 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -7,10 +7,9 @@ TARGET_ARCH = "armeb"
PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
MACHINE_ARCH = "ixp4xxbe"
-IXP4XX_MACHINE_OVERRIDE = ":nslu2:ixp4xx"
+
+OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
require conf/machine/include/ixp4xx.conf
EXTRA_IMAGECMD_jffs2 += "--big-endian"
-
-OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 1dd1ddaf2f..bbbd6cdeb4 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -8,9 +8,8 @@ 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}"
+
require conf/machine/include/ixp4xx.conf
EXTRA_IMAGECMD_jffs2 += "--little-endian"
-
-OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-