diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-05 00:34:12 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-05 00:34:12 +0000 |
| commit | a678820b7afaf0b93cd8949c689112bd723e755c (patch) | |
| tree | a2cdeeda3175b3d94c36c58dd9d19e1e3317de2a /packages/arm-kernel-shim/arm-kernel-shim_1.5.bb | |
| parent | 0e9be06e62d9bfc3a2bfb79848cd6d27a07fc56b (diff) | |
| parent | 70d0e263039165834e23471bdf0f860c46d68c31 (diff) | |
merge of '6f99be19e645cdee7ca3a6e76af76764e4c2140c'
and 'f2bd31f1aaf84bef9625b425a458bc019b97a434'
Diffstat (limited to 'packages/arm-kernel-shim/arm-kernel-shim_1.5.bb')
| -rw-r--r-- | packages/arm-kernel-shim/arm-kernel-shim_1.5.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb index 0788f81609..9e2b6fd912 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.5.bb @@ -3,7 +3,7 @@ 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_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" 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" |