arm-kernel-shim: Updated to version 1.4

5 files changed, 17 insertions, 37 deletions

diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
index 3b20d33a7c..2b285f3b90 100644
--- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
@@ -3,7 +3,7 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-# PR = "r0"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
 
@@ -17,6 +17,13 @@ SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar
 
 S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3
 
+CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
+
+CMDLINE_ROOT_DSMG600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
+CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
+CMDLINE_ROOT_NSLU2   = "root=/dev/mtdblock4 rootfstype=jffs2 rw"
+CMDLINE_ROOT_FSG3    = "root=/dev/mtdblock2 rootfstype=jffs2 rw"
+
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
 
 oe_runmake() {
@@ -29,6 +36,7 @@ oe_runmake() {
 		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
 			${WORKDIR}/config-nslu2.h > ${S}/config.h
 	fi
+	echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_NSLU2} ${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-nslu2
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
@@ -40,6 +48,7 @@ oe_runmake() {
 		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
 			${WORKDIR}/config-nas100d.h > ${S}/config.h
 	fi
+	echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_NAS100D} ${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-nas100d
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
@@ -51,6 +60,7 @@ oe_runmake() {
 		sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
 			${WORKDIR}/config-dsmg600.h > ${S}/config.h
 	fi
+	echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_DSMG600} ${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-dsmg600
 	make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
@@ -62,6 +72,7 @@ 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"
diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h
index f8caccecd4..c320dc1b3b 100644
--- a/packages/arm-kernel-shim/files/config-dsmg600.h
+++ b/packages/arm-kernel-shim/files/config-dsmg600.h
@@ -16,25 +16,15 @@
 
 #define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
-//#define RAM_BANK0_START	   0x00000000
-//#define RAM_BANK0_LENGTH   0x04000000
-
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
-
-#define COMMANDLINE \
- "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug"
-
 #define MACH_TYPE		   964
 
 /* The DSM-G600 RedBoot sets up the ATAGs correctly */
 #define PASSTHROUGH_ATAGS
 
-/* but if the command line passed in is empty, use the default above. */
+/* but if the command line passed in is empty, use the default. */
 #define CMDLINE_IF_NONE
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h
index 08684d708e..fa894e89ac 100644
--- a/packages/arm-kernel-shim/files/config-fsg3.h
+++ b/packages/arm-kernel-shim/files/config-fsg3.h
@@ -19,16 +19,9 @@
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
 
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
-
-//#define COMMANDLINE\
-// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
-
 #define MACH_TYPE		   1091
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h
index 62c5556999..90f5520e7d 100644
--- a/packages/arm-kernel-shim/files/config-nas100d.h
+++ b/packages/arm-kernel-shim/files/config-nas100d.h
@@ -19,16 +19,9 @@
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
 
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
-
-#define COMMANDLINE\
- "console=ttyS0,115200n8 root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc rw noirqdebug"
-
 #define MACH_TYPE		   865
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
 
diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h
index 2b597c2b7f..73566d061d 100644
--- a/packages/arm-kernel-shim/files/config-nslu2.h
+++ b/packages/arm-kernel-shim/files/config-nslu2.h
@@ -19,16 +19,9 @@
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x02000000
 
-//#define RAM_BANK1_START	   0xd0000000
-//#define RAM_BANK1_LENGTH   0x10000000
-
-#define COMMANDLINE\
- "console=ttyS0,115200n8 root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc rw noirqdebug"
-
 #define MACH_TYPE		   597
 
-/* Uncomment one of these if you need to switch the CPU into a
-   specific mode. */
+/* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN