From 68e1462d95f8bdac57ce74e4583d92af8f754b40 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 27 Jan 2007 21:01:31 +0000 Subject: ixp4xx-related files: Replaced IXP4XX_MACHINE_ENDIAN with SITEINFO_ENDIANESS throughout OE, removing all instances of ixp4xx-specific ENDIAN checks in the OE metadata. --- conf/machine/include/ixp4xx.conf | 8 -------- conf/machine/include/tune-xscale.conf | 2 +- conf/machine/ixp4xxbe.conf | 8 +++----- conf/machine/ixp4xxle.conf | 8 +++----- conf/machine/nslu2.conf | 13 +++++-------- 5 files changed, 12 insertions(+), 27 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 42ca723d90..0558e03e35 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -21,14 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" # # description -IXP4XX_MACHINE_ENDIAN ?= "le" -# "be" "le" -# The memory byte sex and (on correctly implemented hardware - the IXP4XX is -# correct) the byte sex of the buses within the system. 'be' (big-endian) -# means that the first byte is the most significant byte on a bus, 'le' -# (little-endian) means that the first byte is the least significant byte. -# Default to little-endian mode (since EABI does not support big endian yet) - ARM_INSTRUCTION_SET = "arm" # "arm" "thumb" # The instruction set the compiler should use when generating application diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf index e5fea93912..1d212946e4 100644 --- a/conf/machine/include/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.conf @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "armv5te" +PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index cd02d7c821..d9737c9964 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -2,14 +2,12 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode -IXP4XX_MACHINE_ENDIAN = "be" - -require conf/machine/include/ixp4xx.conf - 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 EXTRA_IMAGECMD_jffs2 += "--big-endian" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index e40b98b876..4747fa50c4 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -2,14 +2,12 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode -IXP4XX_MACHINE_ENDIAN = "le" - -require conf/machine/include/ixp4xx.conf - 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 EXTRA_IMAGECMD_jffs2 += " --little-endian" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index fa42771331..966334a0d6 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,23 +2,20 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -# Note that IXP4XX_MACHINE_ENDIAN gets set by the DISTRO for the "nslu2" machine. +# 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). -TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +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). -MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +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_ARCH = "${@['armeb', 'arm'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +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). -PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', 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('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" -- cgit v1.2.3