From 8724f16eaa787e6b9ef103640c374286bbd4db7a Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 11 Jan 2006 10:23:01 +0000
Subject: slugos: Enabled JFFS2 endianness to be controlled.

---
 packages/linux/nas100d-kernel.inc | 14 +++++++++++++-
 packages/linux/nslu2-kernel.inc   | 14 +++++++++++++-
 packages/meta/slugos-image.bb     |  3 +--
 3 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/nas100d-kernel.inc b/packages/linux/nas100d-kernel.inc
index 6dd8a46001..69e9f4d285 100644
--- a/packages/linux/nas100d-kernel.inc
+++ b/packages/linux/nas100d-kernel.inc
@@ -210,7 +210,19 @@ do_configure_prepend() {
 	then
 		echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config'
 	fi
-	sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config'
+	if test '${SLUGOS_IMAGESEX}' = big-endian
+	then
+		echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config'
+	fi
+	if test '${SLUGOS_IMAGESEX}' = little-endian
+	then
+		echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config'
+	fi
+	sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \
+		-e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \
+		-e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \
+		-e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \
+		'${WORKDIR}/defconfig' >>'${S}/.config'
 	rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
 	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
 }
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index f41b61c033..ee0d233ac2 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -200,7 +200,19 @@ do_configure_prepend() {
 	then
 		echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config'
 	fi
-	sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config'
+	if test '${SLUGOS_IMAGESEX}' = big-endian
+	then
+		echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config'
+	fi
+	if test '${SLUGOS_IMAGESEX}' = little-endian
+	then
+		echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config'
+	fi
+	sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \
+		-e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \
+		-e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \
+		-e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \
+		'${WORKDIR}/defconfig' >>'${S}/.config'
 	rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
 	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
 }
diff --git a/packages/meta/slugos-image.bb b/packages/meta/slugos-image.bb
index 6a4db265d8..b80b6f7b3a 100644
--- a/packages/meta/slugos-image.bb
+++ b/packages/meta/slugos-image.bb
@@ -22,9 +22,8 @@ N2K_SUFFIX ?= "nslu2${ARCH_BYTE_SEX}"
 # Why have anything in the config file to control the image build - why not
 # just select a different image .bb file (e.g. slugos-ramdisk-image.bb) to
 # build with different options.
-# IMAGE_SEX = "${@['big-endian', 'little-endian'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}"
 SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
-EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}"
+EXTRA_IMAGECMD_jffs2 = "--pad --${SLUGOS_IMAGESEX} --eraseblock=0x20000 -D ${SLUGOS_DEVICE_TABLE}"
 
 # IMAGE_PREPROCESS_COMMAND is run before making the image.  In SlugOS the
 # kernel image is removed from the root file system to recover the space used -
-- 
cgit v1.2.3