merge of 'd869db4c0ac7d1350976e17e00fe6ec914dd9499'

     and 'dede9079788e02b5f4efb62d0efbe5df90c32ee0'

7 files changed, 22 insertions, 58 deletions

diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 582306bea0..1bab2f5fc7 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -8,36 +8,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
 
-#-------------------------------------------------------------------------------
-# INPUTS
-#-------------------------------------------------------------------------------
-# conf/${DISTRO}.conf is included after this file and should be used to modify
-# variables identified as 'INPUTS' to the required values for the DISTRO, this
-# will cause the board specific settings (which depend for the most part on the
-# exact CPU used) to be set correctly within this file.  The results are the
-# variables identifies here as 'OUTPUTS'
-#
-#variable = "default"
-# <possible values>
-#    description
-
-DISTRO_BASE = ""
-# "" ":<base>"
-#    If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
-#    after ${DISTRO}, this allows different distros to share a common base of
-#    overrides.  The value given must include a leading ':' or chaos will result.
-
-#-------------------------------------------------------------------------------
-# OUTPUTS
-#-------------------------------------------------------------------------------
-
-#OVERRIDES
-#    The standard ':' separated list of overrides used by bitbake - see the
-#    basic setting in bitbake.conf.  This list is based on that used for the
-#    standard setting however :<base> will be
-#    inserted at appropriate points if a base distro is enabled in the inputs.
-OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
-
 require conf/machine/include/tune-xscale.conf
 require conf/machine/include/tune-thumb.conf
 
diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf
index 3397d170f8..0a1e54c324 100644
--- a/conf/machine/ixp4xx.conf
+++ b/conf/machine/ixp4xx.conf
@@ -2,4 +2,4 @@
 #@NAME: Generic IXP4XX kernel
 #@DESCRIPTION: Machine configuration for a generic ixp4xx board
 
-require conf/machine/include/ixp4xx.conf
+MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')}
diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
index d9737c9964..f208852d3a 100644
--- a/conf/machine/ixp4xxbe.conf
+++ b/conf/machine/ixp4xxbe.conf
@@ -3,10 +3,8 @@
 #@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode
 
 TARGET_ARCH = "armeb"
-# PACKAGE_ARCH is set in tune-xscale.conf
-PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb"
 
-MACHINE_ARCH = "ixp4xxbe"
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb"
 
 require conf/machine/include/ixp4xx.conf
 
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index 4747fa50c4..d39fa1f603 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -3,10 +3,8 @@
 #@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode
 
 TARGET_ARCH = "arm"
-# PACKAGE_ARCH is set in tune-xscale.conf
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
-MACHINE_ARCH = "ixp4xxle"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
 require conf/machine/include/ixp4xx.conf
 
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 966334a0d6..7e45825f69 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -2,20 +2,4 @@
 #@NAME: Linksys NSLU2
 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
 
-# Note that TARGET_ARCH gets set by the DISTRO for the "nslu2" machine.
-# (Yes, this was a mistake, but it's legacy and can't be easily changed now.)
-# The "nslu2" machine is deprecated - use "nslu2le" or "nslu2be" instead.
-
-require conf/machine/include/ixp4xx.conf
-
-# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be).
-MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
-
-# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be).
-PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
-
-# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be).
-PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
-
-# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be).
-EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
+MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')}
diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf
index 7cbdd80c1b..16d1ed8508 100644
--- a/conf/machine/nslu2be.conf
+++ b/conf/machine/nslu2be.conf
@@ -2,8 +2,15 @@
 #@NAME: Linksys NSLU2 (big-endian)
 #@DESCRIPTION: Machine configuration for an NSLU2 in big-endian mode
 
-require conf/machine/ixp4xxbe.conf
+TARGET_ARCH = "armeb"
+
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
 
 MACHINE_ARCH = "ixp4xxbe"
+IXP4XX_MACHINE_OVERRIDE = ":nslu2:ixp4xx"
+
+require conf/machine/include/ixp4xx.conf
+
+EXTRA_IMAGECMD_jffs2 += "--big-endian"
 
-PACKAGE_EXTRA_ARCHS += "ixp4xxbe"
+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 cc8e8b8b98..1dd1ddaf2f 100644
--- a/conf/machine/nslu2le.conf
+++ b/conf/machine/nslu2le.conf
@@ -2,8 +2,15 @@
 #@NAME: Linksys NSLU2 (little-endian)
 #@DESCRIPTION: Machine configuration for an NSLU2 in little-endian mode
 
-require conf/machine/ixp4xxle.conf
+TARGET_ARCH = "arm"
+
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xxle"
 
 MACHINE_ARCH = "ixp4xxle"
 
-PACKAGE_EXTRA_ARCHS += "ixp4xxle"
+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}"
+