sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

scripts: Various tweaks/fixes for the qemu scripts 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3440 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2008-01-09 14:14:12 +00:00
parent 0f1ddc5c32
commit 4a7acb65f6
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/poky-qemu-internal
View File

@ -60,7 +60,7 @@ fi
if [ "$MACHINE" = "qemuarm" ]; then
QEMU=`which qemu-system-arm`
if [ "$TYPE" = "ext2" ]; then
QEMUOPTIONS="-append \"root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
QEMUOPTIONS="-append 'root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY' $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
fi
if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then
@ -70,14 +70,14 @@ if [ "$MACHINE" = "qemuarm" ]; then
echo "Error, NFS mount point $HDIMAGE doesn't exist"
return
fi
QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb"
QEMUOPTIONS="-append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -M versatilepb"
fi
fi
if [ "$MACHINE" = "qemux86" ]; then
QEMU=`which qemu`
if [ "$TYPE" = "ext2" ]; then
QEMUOPTIONS="-std-vga -append \"root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
QEMUOPTIONS="-std-vga -append 'root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
fi
if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then
@ -87,7 +87,7 @@ if [ "$MACHINE" = "qemux86" ]; then
echo "Error, NFS mount point $HDIMAGE doesn't exist."
return
fi
QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD"
QEMUOPTIONS="-std-vga -append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD"
fi
fi
@ -124,6 +124,4 @@ fi
echo "Running $QEMU using sudo..."
echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS
sudo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"

8
scripts/runqemu
View File

@ -62,7 +62,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
if [ "x$ZIMAGE" = "x" ]; then
ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
fi
CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux/bin
CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux-gnueabi/bin
fi
if [ "$MACHINE" = "qemuarm" ]; then
@ -73,6 +73,8 @@ if [ "$MACHINE" = "qemuarm" ]; then
HDIMAGE="$T-sdk-qemuarm.ext2"
elif [ -e "$T-sato-qemuarm.ext2" ]; then
HDIMAGE="$T-sato-qemuarm.ext2"
elif [ -e "$T-minimal-qemuarm.ext2" ]; then
HDIMAGE="$T-minimal-qemuarm.ext2"
fi
fi
fi
@ -105,10 +107,12 @@ if [ "$MACHINE" = "qemux86" ]; then
HDIMAGE=$T-sdk-qemux86.ext2
elif [ -e "$T-sato-qemux86.ext2" ]; then
HDIMAGE=$T-sato-qemux86.ext2
elif [ -e "$T-minimal-qemux86.ext2" ]; then
HDIMAGE=$T-minimal-qemux86.ext2
fi
fi
fi
CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin
CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux-gnueabi/bin
fi
export PATH=$CROSSPATH:$PATH