summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-03-25 05:35:59 +0000
committerRod Whitby <rod@whitby.id.au>2007-03-25 05:35:59 +0000
commit93a28f8e6f88b974630f36d59c7f273e12f6a3be (patch)
tree663baf8b908844dd8cae89a6bcedd2f87e5bf6be /conf/machine
parent48c9a98908284963902fc29b4c47aed668bd5432 (diff)
parent91a686ccf1d8c457b592f924d81e4ac502283199 (diff)
merge of '6a73c5c1eb38e3cc78e63a37f3471f4cc581b27b'
and 'ea9eb1ab8940b614ef5bbd25f1275174941d1e40'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/nslu2be.conf1
-rw-r--r--conf/machine/nslu2le.conf2
2 files changed, 3 insertions, 0 deletions
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 87fab62b65..104bbdb397 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -16,3 +16,4 @@ require conf/machine/include/ixp4xx.conf
EXTRA_IMAGECMD_jffs2 += "--big-endian"
+INHERIT += "nslu2-image"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 16114a80fa..86c4ce7a31 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -15,3 +15,5 @@ ROOT_FLASH_SIZE ?= "6"
require conf/machine/include/ixp4xx.conf
EXTRA_IMAGECMD_jffs2 += "--little-endian"
+
+INHERIT += "nslu2-image"