[oe-commits] org.oe.dev nslu2.conf: Deprecated in favour of nslu2le.conf and nslu2be.conf.

[rwhitby commit]

nslu2.conf: Deprecated in favour of nslu2le.conf and nslu2be.conf.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c20ea006f5c07c135b16a8a30893f175d5bd073e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c20ea006f5c07c135b16a8a30893f175d5bd073e
Files:
1
conf/machine/nslu2.conf
conf/machine/nslu2be.conf
conf/machine/nslu2le.conf
Diffs:

#
# mt diff -r3e37a72b93ad1bc086116ea17d648d6b3510115e -rc20ea006f5c07c135b16a8a30893f175d5bd073e
#
# 
# 
# patch "conf/machine/nslu2.conf"
#  from [7a5c5859381c5c6392aee605c19d1257071a5b42]
#    to [6f938da28cff58e052a7730401155c12cdce1466]
# 
# patch "conf/machine/nslu2be.conf"
#  from [022cfedc3602993b6c8a0614db0b7754bccb1240]
#    to [15ddd677b7bea545d74b4951aa95c605e4f87c77]
# 
# patch "conf/machine/nslu2le.conf"
#  from [be40ff51433e276608d549a5daec9535dd8956a9]
#    to [7834504433a545c36deee3544a2ee1029cab3cee]
# 
============================================================
--- conf/machine/nslu2.conf	7a5c5859381c5c6392aee605c19d1257071a5b42
+++ conf/machine/nslu2.conf	6f938da28cff58e052a7730401155c12cdce1466
@@ -1,21 +1,5 @@
 #@TYPE: Machine
 #@NAME: Linksys NSLU2
 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product
 
+MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to nslu2le or nslu2be.')}
-# 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']}"
============================================================
--- conf/machine/nslu2be.conf	022cfedc3602993b6c8a0614db0b7754bccb1240
+++ conf/machine/nslu2be.conf	15ddd677b7bea545d74b4951aa95c605e4f87c77
@@ -1,9 +1,16 @@
 #@TYPE: Machine
 #@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"
+
+OVERRIDES = "local:${MACHINE}:nslu2:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-PACKAGE_EXTRA_ARCHS += "ixp4xxbe"
============================================================
--- conf/machine/nslu2le.conf	be40ff51433e276608d549a5daec9535dd8956a9
+++ conf/machine/nslu2le.conf	7834504433a545c36deee3544a2ee1029cab3cee
@@ -1,9 +1,16 @@
 #@TYPE: Machine
 #@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"
 
+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}"
+
-PACKAGE_EXTRA_ARCHS += "ixp4xxle"