summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-qemu-internal12
-rwxr-xr-xscripts/runqemu8
2 files changed, 11 insertions, 9 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index e715844af4..82e6a038df 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -60,7 +60,7 @@ fi
60if [ "$MACHINE" = "qemuarm" ]; then 60if [ "$MACHINE" = "qemuarm" ]; then
61 QEMU=`which qemu-system-arm` 61 QEMU=`which qemu-system-arm`
62 if [ "$TYPE" = "ext2" ]; then 62 if [ "$TYPE" = "ext2" ]; then
63 QEMUOPTIONS="-append \"root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet" 63 QEMUOPTIONS="-append 'root=/dev/sda console=ttyAMA0 console=tty0 mem=$QEMU_MEMORY' $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
64 fi 64 fi
65 if [ "$TYPE" = "nfs" ]; then 65 if [ "$TYPE" = "nfs" ]; then
66 if [ "x$HDIMAGE" = "x" ]; then 66 if [ "x$HDIMAGE" = "x" ]; then
@@ -70,14 +70,14 @@ if [ "$MACHINE" = "qemuarm" ]; then
70 echo "Error, NFS mount point $HDIMAGE doesn't exist" 70 echo "Error, NFS mount point $HDIMAGE doesn't exist"
71 return 71 return
72 fi 72 fi
73 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb" 73 QEMUOPTIONS="-append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -M versatilepb"
74 fi 74 fi
75fi 75fi
76 76
77if [ "$MACHINE" = "qemux86" ]; then 77if [ "$MACHINE" = "qemux86" ]; then
78 QEMU=`which qemu` 78 QEMU=`which qemu`
79 if [ "$TYPE" = "ext2" ]; then 79 if [ "$TYPE" = "ext2" ]; then
80 QEMUOPTIONS="-std-vga -append \"root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" 80 QEMUOPTIONS="-std-vga -append 'root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
81 fi 81 fi
82 if [ "$TYPE" = "nfs" ]; then 82 if [ "$TYPE" = "nfs" ]; then
83 if [ "x$HDIMAGE" = "x" ]; then 83 if [ "x$HDIMAGE" = "x" ]; then
@@ -87,7 +87,7 @@ if [ "$MACHINE" = "qemux86" ]; then
87 echo "Error, NFS mount point $HDIMAGE doesn't exist." 87 echo "Error, NFS mount point $HDIMAGE doesn't exist."
88 return 88 return
89 fi 89 fi
90 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD" 90 QEMUOPTIONS="-std-vga -append 'root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD' $QEMU_NETWORK_CMD"
91 fi 91 fi
92fi 92fi
93 93
@@ -124,6 +124,4 @@ fi
124 124
125echo "Running $QEMU using sudo..." 125echo "Running $QEMU using sudo..."
126echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" 126echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
127sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS 127sudo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
128
129
diff --git a/scripts/runqemu b/scripts/runqemu
index d3df26c48a..bc40b46745 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -62,7 +62,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
62 if [ "x$ZIMAGE" = "x" ]; then 62 if [ "x$ZIMAGE" = "x" ]; then
63 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin 63 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
64 fi 64 fi
65 CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux/bin 65 CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux-gnueabi/bin
66fi 66fi
67 67
68if [ "$MACHINE" = "qemuarm" ]; then 68if [ "$MACHINE" = "qemuarm" ]; then
@@ -73,6 +73,8 @@ if [ "$MACHINE" = "qemuarm" ]; then
73 HDIMAGE="$T-sdk-qemuarm.ext2" 73 HDIMAGE="$T-sdk-qemuarm.ext2"
74 elif [ -e "$T-sato-qemuarm.ext2" ]; then 74 elif [ -e "$T-sato-qemuarm.ext2" ]; then
75 HDIMAGE="$T-sato-qemuarm.ext2" 75 HDIMAGE="$T-sato-qemuarm.ext2"
76 elif [ -e "$T-minimal-qemuarm.ext2" ]; then
77 HDIMAGE="$T-minimal-qemuarm.ext2"
76 fi 78 fi
77 fi 79 fi
78 fi 80 fi
@@ -105,10 +107,12 @@ if [ "$MACHINE" = "qemux86" ]; then
105 HDIMAGE=$T-sdk-qemux86.ext2 107 HDIMAGE=$T-sdk-qemux86.ext2
106 elif [ -e "$T-sato-qemux86.ext2" ]; then 108 elif [ -e "$T-sato-qemux86.ext2" ]; then
107 HDIMAGE=$T-sato-qemux86.ext2 109 HDIMAGE=$T-sato-qemux86.ext2
110 elif [ -e "$T-minimal-qemux86.ext2" ]; then
111 HDIMAGE=$T-minimal-qemux86.ext2
108 fi 112 fi
109 fi 113 fi
110 fi 114 fi
111 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin 115 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux-gnueabi/bin
112fi 116fi
113 117
114export PATH=$CROSSPATH:$PATH 118export PATH=$CROSSPATH:$PATH