[oe-commits] org.oe.dev arm-kernel-shim: Updated the FSG-3 configuration to allow the bootloader cmdline to pass through.

[rwhitby commit]

arm-kernel-shim: Updated the FSG-3 configuration to allow the bootloader cmdline to pass through.

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

#
# mt diff -r005e8450d6bc31cd6fba46f5f0464a08d3eb0a17 -redcd7cc3ce3933c1022989d2297e120211a6d3fa
#
# 
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
#  from [363539e6aa9b48b4075ef6f22841c250058075ba]
#    to [691bb266bc3a89e594d2718bda178991edd6718a]
# 
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
#  from [6420555a5dfd7edfd3e08a847c058eb380b637df]
#    to [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
# 
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	363539e6aa9b48b4075ef6f22841c250058075ba
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	691bb266bc3a89e594d2718bda178991edd6718a
@@ -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,7 +20,7 @@ CMDLINE_ROOT_NSLU2   = "root=/dev/mtdblo
 CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
 CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
 CMDLINE_ROOT_NSLU2   = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc"
-CMDLINE_ROOT_FSG3    = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc"
+# CMDLINE is passed correctly on the Freecom FSG-3 from the bootloader.
 
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
 
@@ -70,7 +70,6 @@ oe_runmake() {
 		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
 			${WORKDIR}/config-fsg3.h > ${S}/config.h
 	fi
-	echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_FSG3} ${CMDLINE_DEBUG}\"" >> ${S}/config.h
 	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-fsg3.h	6420555a5dfd7edfd3e08a847c058eb380b637df
+++ packages/arm-kernel-shim/files/config-fsg3.h	cf13549daefc67ce00ab2a9b1280d2363849d1e7
@@ -21,8 +21,6 @@
 
 #define MACH_TYPE		   1091
 
-#define CREATE_ATAGS
-
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN