Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/04/21 01:12:51+02:00 uni-frankfurt.de!mickey
fix CMDLINE in kernel 2.6.5-jl1

2004/04/21 01:01:19+02:00 uni-frankfurt.de!mickey
simpad-make-flashimg fixlet

BKrev: 4086242cnKqmPgbRa3QOhJGdIfAifA

diff --git a/linux/openzaurus_2.6.5-jl1.oe b/linux/openzaurus_2.6.5-jl1.oe
index 544e44a..eafe0ca 100644 (file)
--- a/linux/openzaurus_2.6.5-jl1.oe
+++ b/linux/openzaurus_2.6.5-jl1.oe
@@ -16,7 +16,7 @@ inherit kernel
 #FIXME: Use configuration system
 export MEM = "32"
 export RD = "32"
-export CMDLINE = "root=/dev/mtdblock4 console=tty0 rootfstype=jffs2 jffs2_orphand_inodes=delete"
+export CMDLINE = "noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jffs2_orphand_inodes=delete"
 EXTRA_OEMAKE = ""
 
 do_configure_prepend() {

diff --git a/simpad-utilities/genboot/simpad-make-flashimg b/simpad-utilities/genboot/simpad-make-flashimg
index 95877f1..e29de3f 100644 (file)
--- a/simpad-utilities/genboot/simpad-make-flashimg
+++ b/simpad-utilities/genboot/simpad-make-flashimg
@@ -9,11 +9,12 @@
 GENBOOT=genboot
 PAD=pad
 KERNEL=$2
+INITRD=$3
 
 doComplete()
 {
     kernel=$(basename $KERNEL)
-    initrd=$OUTPUT_DIR/images/initrd.bin
+    initrd=$INITRD
     outfile=/tmp/tmpfile
     padfile=/tmp/tmpfile2
     flashfile=$kernel.initrd.flashfile
@@ -76,13 +77,13 @@ doKernelInPlace()
 }
 
 if [ $# -lt 2 ]
-    then echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel>" && exit -1
+    then echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel> [rootfs.jffs2]" && exit -1
 fi
 
 case "$1" in
 kernel) doKernel;;
 complete) doComplete;;
 inplace) doKernelInPlace;;
-*) echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel>"; exit;;
+*) echo "Usage: ./simpad-make-flashimg [kernel|complete|inplace] <kernel> [rootfs.jffs2]"; exit;;
 esac