[oe-commits] org.oe.dev ixp4xx.conf: Deprecated in favour of ixp4xxle.conf and ixp4xxbe.conf, and moved the OVERRIDES and MACHINE_ARCH stuff into nslu2.conf machine files.

[rwhitby commit]

ixp4xx.conf: Deprecated in favour of ixp4xxle.conf and ixp4xxbe.conf, and moved the OVERRIDES and MACHINE_ARCH stuff into nslu2.conf machine files.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 3e37a72b93ad1bc086116ea17d648d6b3510115e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3e37a72b93ad1bc086116ea17d648d6b3510115e
Files:
1
conf/machine/include/ixp4xx.conf
conf/machine/ixp4xx.conf
conf/machine/ixp4xxbe.conf
conf/machine/ixp4xxle.conf
Diffs:

#
# mt diff -rcf6150fadd42a53d87a9c06fcff2d9f46b00cb89 -r3e37a72b93ad1bc086116ea17d648d6b3510115e
#
# 
# 
# patch "conf/machine/include/ixp4xx.conf"
#  from [a48d913ee1a5a3db5a91d22385c92f83e5d97a2a]
#    to [1ec3ce5e8a6b5cfd21dbb687b339bc2a67280cac]
# 
# patch "conf/machine/ixp4xx.conf"
#  from [453ff66188baa74870591b8bbb7d9905b0fa1234]
#    to [40cc68ace2c0a1981c1c72da20ded59a15c27173]
# 
# patch "conf/machine/ixp4xxbe.conf"
#  from [c46add1de61652d7a18a7583142a9a242cdc1431]
#    to [bde9db3ec0ec183465c84d2be6e295876a8b4774]
# 
# patch "conf/machine/ixp4xxle.conf"
#  from [2df8ab5a1ca7c734b49252fc999a569a672c94c9]
#    to [2a641ad0d5809065fd9222425c51adcdb5479469]
# 
============================================================
--- conf/machine/include/ixp4xx.conf	a48d913ee1a5a3db5a91d22385c92f83e5d97a2a
+++ conf/machine/include/ixp4xx.conf	1ec3ce5e8a6b5cfd21dbb687b339bc2a67280cac
@@ -8,36 +8,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ix
 
 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
 
============================================================
--- conf/machine/ixp4xx.conf	453ff66188baa74870591b8bbb7d9905b0fa1234
+++ conf/machine/ixp4xx.conf	40cc68ace2c0a1981c1c72da20ded59a15c27173
@@ -1,5 +1,5 @@
 #@TYPE: Machine
 #@NAME: Generic IXP4XX kernel
 #@DESCRIPTION: Machine configuration for a generic ixp4xx board
 
+MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')}
-require conf/machine/include/ixp4xx.conf
============================================================
--- conf/machine/ixp4xxbe.conf	c46add1de61652d7a18a7583142a9a242cdc1431
+++ conf/machine/ixp4xxbe.conf	bde9db3ec0ec183465c84d2be6e295876a8b4774
@@ -1,12 +1,10 @@ TARGET_ARCH = "armeb"
 #@TYPE: Machine
 #@NAME: Generic IXP4XX kernel
 #@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
 
============================================================
--- conf/machine/ixp4xxle.conf	2df8ab5a1ca7c734b49252fc999a569a672c94c9
+++ conf/machine/ixp4xxle.conf	2a641ad0d5809065fd9222425c51adcdb5479469
@@ -1,12 +1,10 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@NAME: Generic IXP4XX kernel
 #@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