diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-04-21 07:35:08 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-04-21 07:35:08 +0000 |
| commit | 3a89c2e82c2eb41804e60f45ae308298dacd60a6 (patch) | |
| tree | 0c74012ec891066fa4e5eab4f3a31a05a9200ef9 | |
| parent | 83c4dd95e1cb221a9afc49f856a99f0b182b2a7f (diff) | |
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
| -rw-r--r-- | linux/openzaurus_2.6.5-jl1.oe | 2 | ||||
| -rw-r--r-- | simpad-utilities/genboot/simpad-make-flashimg | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/linux/openzaurus_2.6.5-jl1.oe b/linux/openzaurus_2.6.5-jl1.oe index 544e44aef1..eafe0ca771 100644 --- 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 95877f115f..e29de3f94f 100644 --- 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 |