ixp4xx-related files: Replaced IXP4XX_MACHINE_ENDIAN with SITEINFO_ENDIANESS throughout OE, removing all instances of ixp4xx-specific ENDIAN checks in the OE metadata.

13 files changed, 19 insertions, 37 deletions

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 89ea08a157..4c849d095d 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -11,7 +11,6 @@
 # slugos-[bl][at][gu] - a specific configuration encoded as follows:
 #
 #  b or l - big or little endian
-#         set IXP4XX_MACHINE_ENDIAN to match
 #
 #  a or t - ARM or Thumb instructions in the low level libraries
 #         set ARM_INSTRUCTION_SET to match
@@ -45,7 +44,6 @@ DISTRO_FEED ?= "unstable"
 
 # The following must also be set, they define the basic format of the build
 #
-#IXP4XX_MACHINE_ENDIAN "be" or "le"
 #ARM_INSTRUCTION_SET "arm" or "thumb"
 #TARGET_OS "linux" or "linux-uclibc"
 #SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format)
@@ -55,7 +53,7 @@ DISTRO_FEED ?= "unstable"
 USE_NLS ?= "no"
 
 # To make errors easier to identify:
-DISTRO_NAME ?= "INVALID-${IXP4XX_MACHINE_ENDIAN}-${ARM_INSTRUCTION_SET}-${TARGET_OS}"
+DISTRO_NAME ?= "INVALID-${SITEINFO_ENDIANESS}-${ARM_INSTRUCTION_SET}-${TARGET_OS}"
 DISTRO_TYPE ?= "INVALID"
 
 # The following must not be changed.
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf
index 89e61cb386..23e8690752 100644
--- a/conf/distro/slugos-bag.conf
+++ b/conf/distro/slugos-bag.conf
@@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-bag"
 # DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
-IXP4XX_MACHINE_ENDIAN = "be"
+TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
 SLUGOS_IMAGESEX  ?= "big-endian"
diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf
index c6a609d3c5..5e461ff063 100644
--- a/conf/distro/slugos-bau.conf
+++ b/conf/distro/slugos-bau.conf
@@ -11,7 +11,7 @@ DISTRO_NAME ?= "slugos-bau"
 # DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
-IXP4XX_MACHINE_ENDIAN = "be"
+TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-uclibc"
 SLUGOS_IMAGESEX  ?= "big-endian"
diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf
index a378551665..4fbdd9e37b 100644
--- a/conf/distro/slugos-btu.conf
+++ b/conf/distro/slugos-btu.conf
@@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-btu"
 # DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
-IXP4XX_MACHINE_ENDIAN = "be"
+TARGET_ARCH = "armeb"
 ARM_INSTRUCTION_SET = "thumb"
 TARGET_OS = "linux-uclibc"
 SLUGOS_IMAGESEX  ?= "big-endian"
diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf
index feefb88407..838d6cf48b 100644
--- a/conf/distro/slugos-lag.conf
+++ b/conf/distro/slugos-lag.conf
@@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-lag"
 # DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
-IXP4XX_MACHINE_ENDIAN = "le"
+TARGET_ARCH = "arm"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux"
 SLUGOS_IMAGESEX  ?= "big-endian"
diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf
index 098f8684b7..7294c1dfd2 100644
--- a/conf/distro/slugos-lau.conf
+++ b/conf/distro/slugos-lau.conf
@@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-lau"
 # DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "alpha"
 
-IXP4XX_MACHINE_ENDIAN = "le"
+TARGET_ARCH = "arm"
 ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-uclibc"
 SLUGOS_IMAGESEX  ?= "big-endian"
diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf
index 2151446205..53fbb407a7 100644
--- a/conf/distro/slugos-ltu.conf
+++ b/conf/distro/slugos-ltu.conf
@@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-ltu"
 # DISTRO_FEED ?= "unstable"
 DISTRO_TYPE ?= "beta"
 
-IXP4XX_MACHINE_ENDIAN = "le"
+TARGET_ARCH = "arm"
 ARM_INSTRUCTION_SET = "thumb"
 TARGET_OS = "linux-uclibc"
 SLUGOS_IMAGESEX  ?= "big-endian"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 9608b93885..b25b94d79f 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -18,7 +18,6 @@ TARGET_FPU = "soft"
 TARGET_OS = "linux"
 
 # select distro specific options to match that of the original LinkSys build
-IXP4XX_MACHINE_ENDIAN = "be"
 ARM_INSTRUCTION_SET = "arm"
 THUMB_INTERWORK = "no"
 
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"
 # <possible values>
 #    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']}"