[oe-commits] org.oe.dev arm-kernel-shim: Now does the endianness switch prepend code as well. Tested on slugosbe and slugosle.

rwhitby commit openembedded-commits at lists.openembedded.org
Mon Feb 12 08:28:26 UTC 2007


arm-kernel-shim: Now does the endianness switch prepend code as well.  Tested on slugosbe and slugosle.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: db8b961c4a483000a0fb217548d3b4cd968f5e1f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=db8b961c4a483000a0fb217548d3b4cd968f5e1f
Files:
1
packages/arm-kernel-shim/arm-kernel-shim_1.3.bb
packages/arm-kernel-shim/files/config-dsmg600.h
packages/arm-kernel-shim/files/config-fsg3.h
packages/arm-kernel-shim/files/config-nas100d.h
packages/arm-kernel-shim/files/config-nslu2.h
Diffs:

#
# mt diff -re83f41413f5d1222df90e7c4053b8a578743dc38 -rdb8b961c4a483000a0fb217548d3b4cd968f5e1f
#
# 
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.3.bb"
#  from [7af21c9cba7304eae806f75accbcefe67e5f80fe]
#    to [f2125bdbb9b1ee2fe17ce293e4e0df55040ce537]
# 
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
#  from [c104f999b6804f585e9de1733bef8bdca962a4bf]
#    to [ea46b106ea44574e2574fe30cf4d3cfaf820b161]
# 
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
#  from [981ca8e2ddb315270dc7cf09749e5660c9bea778]
#    to [4546e3a37e57fc605f415b766bed5e8ce53ed941]
# 
# patch "packages/arm-kernel-shim/files/config-nas100d.h"
#  from [886a8aee91172babf167e25d69435bcb1f4e66e3]
#    to [70d230c7a81a65cfee28136aae9b0f85a7b3a453]
# 
# patch "packages/arm-kernel-shim/files/config-nslu2.h"
#  from [cb64580bbaa4abda3c74c43c9956160f1cfe5717]
#    to [d0d7b221332311a54f771026d204113179081dda]
# 
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.3.bb	7af21c9cba7304eae806f75accbcefe67e5f80fe
+++ packages/arm-kernel-shim/arm-kernel-shim_1.3.bb	f2125bdbb9b1ee2fe17ce293e4e0df55040ce537
@@ -1,9 +1,9 @@ LICENSE = "GPL"
 DESCRIPTION = "ARM Kernel Shim"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
 
@@ -20,22 +20,46 @@ oe_runmake() {
 oe_runmake() {
 	mv ${S}/config.h ${S}/config.h.orig
 	# NSLU2
-	cp ${WORKDIR}/config-nslu2.h ${S}/config.h
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-nslu2.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-nslu2.h > ${S}/config.h
+	fi
 	rm -f ${S}/main.o
 	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
 	# NAS100d
-	cp ${WORKDIR}/config-nas100d.h ${S}/config.h
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-nas100d.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-nas100d.h > ${S}/config.h
+	fi
 	rm -f ${S}/main.o
 	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
 	# DSMG-600
-	cp ${WORKDIR}/config-dsmg600.h ${S}/config.h
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-dsmg600.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-dsmg600.h > ${S}/config.h
+	fi
 	rm -f ${S}/main.o
 	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
 	# FSG-3
-	cp ${WORKDIR}/config-fsg3.h ${S}/config.h
+	if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+		sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+			${WORKDIR}/config-fsg3.h > ${S}/config.h
+	else
+		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+			${WORKDIR}/config-fsg3.h > ${S}/config.h
+	fi
 	rm -f ${S}/main.o
 	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h	c104f999b6804f585e9de1733bef8bdca962a4bf
+++ packages/arm-kernel-shim/files/config-dsmg600.h	ea46b106ea44574e2574fe30cf4d3cfaf820b161
@@ -27,4 +27,9 @@
 
 #define MACH_TYPE		   964
 
+/* Uncomment one of these if you need to switch the CPU into a
+   specific mode. */
+//#define FORCE_LITTLEENDIAN
+//#define FORCE_BIGENDIAN
+
 #endif  /* __CONFIG_H__ */
============================================================
--- packages/arm-kernel-shim/files/config-fsg3.h	981ca8e2ddb315270dc7cf09749e5660c9bea778
+++ packages/arm-kernel-shim/files/config-fsg3.h	4546e3a37e57fc605f415b766bed5e8ce53ed941
@@ -27,4 +27,9 @@
 
 #define MACH_TYPE		   1091
 
+/* Uncomment one of these if you need to switch the CPU into a
+   specific mode. */
+//#define FORCE_LITTLEENDIAN
+//#define FORCE_BIGENDIAN
+
 #endif  /* __CONFIG_H__ */
============================================================
--- packages/arm-kernel-shim/files/config-nas100d.h	886a8aee91172babf167e25d69435bcb1f4e66e3
+++ packages/arm-kernel-shim/files/config-nas100d.h	70d230c7a81a65cfee28136aae9b0f85a7b3a453
@@ -23,8 +23,13 @@
 //#define RAM_BANK1_LENGTH   0x10000000
 
 #define COMMANDLINE\
- "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8"
+ "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
 
 #define MACH_TYPE		   865
 
+/* Uncomment one of these if you need to switch the CPU into a
+   specific mode. */
+//#define FORCE_LITTLEENDIAN
+//#define FORCE_BIGENDIAN
+
 #endif  /* __CONFIG_H__ */
============================================================
--- packages/arm-kernel-shim/files/config-nslu2.h	cb64580bbaa4abda3c74c43c9956160f1cfe5717
+++ packages/arm-kernel-shim/files/config-nslu2.h	d0d7b221332311a54f771026d204113179081dda
@@ -23,8 +23,13 @@
 //#define RAM_BANK1_LENGTH   0x10000000
 
 #define COMMANDLINE\
- "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8"
+ "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
 
 #define MACH_TYPE		   597
 
+/* Uncomment one of these if you need to switch the CPU into a
+   specific mode. */
+//#define FORCE_LITTLEENDIAN
+//#define FORCE_BIGENDIAN
+
 #endif  /* __CONFIG_H__ */






More information about the Openembedded-commits mailing list