From 4f6607cc3419b47b8cf25b63b5f2a5ffece9b0dc Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 23 Jan 2007 02:11:08 +0000
Subject: apex: Changed ixp4xx-specific ARCH_BYTE_SEX variable usage into
 generic CONFIG_SITE based endianness checks

---
 packages/apex/apex_1.4.11.bb | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'packages/apex/apex_1.4.11.bb')

diff --git a/packages/apex/apex_1.4.11.bb b/packages/apex/apex_1.4.11.bb
index bb45a310b0..713cc833fd 100644
--- a/packages/apex/apex_1.4.11.bb
+++ b/packages/apex/apex_1.4.11.bb
@@ -23,18 +23,20 @@ CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linu
 # defconfig to .config
 do_configure() {
 	rm -f ${S}/.config
-	if test '${ARCH_BYTE_SEX}' = be
-	then
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
 	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
-	else
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \
 		${WORKDIR}/defconfig > ${S}/.config
+	else
+	  oefatal do_configure cannot determine endianess
 	fi
 	oe_runmake oldconfig
 }
@@ -43,11 +45,14 @@ DEPENDS += "devio-native"
 
 do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
-	# FIXME - arch-arm should not be hard-coded
-	if test '${ARCH_BYTE_SEX}' = be
-	then
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+		# FIXME - arch-arm should not be hard-coded
 		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin
-	else
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+		# FIXME - arch-arm should not be hard-coded
 		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex.bin 'xp $,4'
+	else
+		oefatal do_populate_staging cannot determine endianess
 	fi
 }
-- 
cgit v1.2.3