[oe-commits] org.oe.dev arm-kernel-shim: Updated to version 1.4
rwhitby commit
openembedded-commits at lists.openembedded.org
Mon May 14 09:24:36 UTC 2007
arm-kernel-shim: Updated to version 1.4
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 769dfe2ef571e72bb7f61bab7010702c15c4781e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=769dfe2ef571e72bb7f61bab7010702c15c4781e
Files:
1
packages/arm-kernel-shim/arm-kernel-shim_1.4.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 -r000f359b0329ee9742742259ace6c1ffaf5cbe16 -r769dfe2ef571e72bb7f61bab7010702c15c4781e
#
#
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.4.bb"
# from [1dfe9561cfac2d777de3f21ce3db298bb36aa7ab]
# to [319f6d6f323839283f600ddf7db1693a277ca0fc]
#
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
# from [be97f6d67a587cc9990ce082b944496fcf8a64de]
# to [37ba1efa5ef33feabbffa4e4f613f520aaa1f230]
#
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
# from [4546e3a37e57fc605f415b766bed5e8ce53ed941]
# to [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
#
# patch "packages/arm-kernel-shim/files/config-nas100d.h"
# from [fbcc2a7a5a5c4a6f740505b4eb585a24c522df7a]
# to [4a38443d07d9779c75450d24c3544a9bc227a380]
#
# patch "packages/arm-kernel-shim/files/config-nslu2.h"
# from [0c74cb73998afc30ddc0f29f1562aa958ab29295]
# to [a3d80ce8cc2a2ecab785a7587305096f1ce59997]
#
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.4.bb 1dfe9561cfac2d777de3f21ce3db298bb36aa7ab
+++ packages/arm-kernel-shim/arm-kernel-shim_1.4.bb 319f6d6f323839283f600ddf7db1693a277ca0fc
@@ -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 = "r0"
+PR = "r2"
COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
@@ -17,6 +17,13 @@ S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3
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"
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h be97f6d67a587cc9990ce082b944496fcf8a64de
+++ packages/arm-kernel-shim/files/config-dsmg600.h 37ba1efa5ef33feabbffa4e4f613f520aaa1f230
@@ -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
============================================================
--- packages/arm-kernel-shim/files/config-fsg3.h 4546e3a37e57fc605f415b766bed5e8ce53ed941
+++ packages/arm-kernel-shim/files/config-fsg3.h cf13549daefc67ce00ab2a9b1280d2363849d1e7
@@ -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
============================================================
--- packages/arm-kernel-shim/files/config-nas100d.h fbcc2a7a5a5c4a6f740505b4eb585a24c522df7a
+++ packages/arm-kernel-shim/files/config-nas100d.h 4a38443d07d9779c75450d24c3544a9bc227a380
@@ -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
============================================================
--- packages/arm-kernel-shim/files/config-nslu2.h 0c74cb73998afc30ddc0f29f1562aa958ab29295
+++ packages/arm-kernel-shim/files/config-nslu2.h a3d80ce8cc2a2ecab785a7587305096f1ce59997
@@ -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
More information about the Openembedded-commits
mailing list