From: Mike Westerhof <mwester@dls.net>
Date: Sat, 2 May 2009 07:06:48 +0000 (-0500)
Subject: nslu2 machine configs: do not inherit machine-specific image class
X-Git-Tag: Release-2010-05/1~3614
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8f9b7e4b46979691a5813361b3d4ecba50a20eb;p=openembedded.git

nslu2 machine configs: do not inherit machine-specific image class
The creation of the NSLU2 full flash image (.bin) file should be
image-specific, since not all images for machines similar to the
NSLU2 have the same flash constraints.
---

diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 5bddf09148..9bc92f1a99 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6"
 require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--big-endian"
-
-INHERIT += "nslu2-image"
diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf
index 4ff36059a6..62e47cb678 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -14,5 +14,3 @@ ROOT_FLASH_SIZE ?= "6"
 require conf/machine/include/ixp4xx.inc
 
 EXTRA_IMAGECMD_jffs2 += "--little-endian"
-
-INHERIT += "nslu2-image"