ixp4xx (and related ixp4xx-specific files): Change all usage of ARCH_BYTE_SEX to IXP4XX_MACHINE_ENDIAN (and ensure COMPATIBLE_MACHINE is in effect whereever it is used). Add the nslu2le and nslu2be machines. Change include/ixp4xx.conf to use tune-xscale and tune-thumb. Remove slugos-specific variables that had global OE equivalents. Deprecate ixp4xx.conf and nslu2.conf in favour of endian-specific replacements.

8 files changed, 10 insertions, 10 deletions

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 7ca663a4d6..1cb9ef0bed 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -11,7 +11,7 @@
 # slugos-[bl][at][gu] - a specific configuration encoded as follows:
 #
 #  b or l - big or little endian
-#         set ARCH_BYTE_SEX to match
+#         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 +45,7 @@ DISTRO_FEED ?= "unstable"
 
 # The following must also be set, they define the basic format of the build
 #
-#ARCH_BYTE_SEX "be" or "le"
+#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 +55,7 @@ DISTRO_FEED ?= "unstable"
 USE_NLS ?= "no"
 
 # To make errors easier to identify:
-DISTRO_NAME ?= "INVALID-${ARCH_BYTE_SEX}-${ARM_INSTRUCTION_SET}-${TARGET_OS}"
+DISTRO_NAME ?= "INVALID-${IXP4XX_MACHINE_ENDIAN}-${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 12deb5e7d8..89e61cb386 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"
 
-ARCH_BYTE_SEX = "be"
+IXP4XX_MACHINE_ENDIAN = "be"
 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 1e74dfc526..c6a609d3c5 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"
 
-ARCH_BYTE_SEX = "be"
+IXP4XX_MACHINE_ENDIAN = "be"
 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 125d6e0746..a378551665 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"
 
-ARCH_BYTE_SEX = "be"
+IXP4XX_MACHINE_ENDIAN = "be"
 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 5d65fcd78b..feefb88407 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"
 
-ARCH_BYTE_SEX = "le"
+IXP4XX_MACHINE_ENDIAN = "le"
 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 56c71fb329..098f8684b7 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"
 
-ARCH_BYTE_SEX = "le"
+IXP4XX_MACHINE_ENDIAN = "le"
 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 5a4f22f017..2151446205 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"
 
-ARCH_BYTE_SEX = "le"
+IXP4XX_MACHINE_ENDIAN = "le"
 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 25ac84d270..befbae8cd7 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -18,7 +18,7 @@ TARGET_FPU = "soft"
 TARGET_OS = "linux"
 
 # select distro specific options to match that of the original LinkSys build
-ARCH_BYTE_SEX = "be"
+IXP4XX_MACHINE_ENDIAN = "be"
 ARM_INSTRUCTION_SET = "arm"
 THUMB_INTERWORK = "no"