summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/poky-qemu-internal29
-rwxr-xr-xscripts/runqemu28
2 files changed, 56 insertions, 1 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 11178a7b50..8e1ffcf248 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -57,6 +57,8 @@ fi
57 57
58case "$MACHINE" in 58case "$MACHINE" in
59 "qemuarm") ;; 59 "qemuarm") ;;
60 "qemumips") ;;
61 "qemuppc") ;;
60 "qemuarmv6") ;; 62 "qemuarmv6") ;;
61 "qemuarmv7") ;; 63 "qemuarmv7") ;;
62 "qemux86") ;; 64 "qemux86") ;;
@@ -82,9 +84,11 @@ fi
82 84
83if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then 85if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
84 QEMU=qemu-system-arm 86 QEMU=qemu-system-arm
87 MACHINE_SUBTYPE=versatilepb
88 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
85 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" 89 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
86 if [ "$TYPE" = "ext3" ]; then 90 if [ "$TYPE" = "ext3" ]; then
87 KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 91 KERNCMDLINE="root=/dev/sda console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
88 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -no-reboot $QEMU_UI_OPTIONS" 92 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -no-reboot $QEMU_UI_OPTIONS"
89 fi 93 fi
90 if [ "$TYPE" = "nfs" ]; then 94 if [ "$TYPE" = "nfs" ]; then
@@ -140,6 +144,29 @@ if [ "$MACHINE" = "spitz" ]; then
140 fi 144 fi
141fi 145fi
142 146
147if [ "$MACHINE" = "qemumips" ]; then
148 QEMU=qemu-system-mips
149 MACHINE_SUBTYPE=malta
150 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga cirrus"
151 if [ "$TYPE" = "ext3" ]; then
152 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
153 KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
154 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $HDIMAGE -no-reboot $QEMU_UI_OPTIONS"
155 fi
156fi
157
158if [ "$MACHINE" = "qemuppc" ]; then
159 QEMU=qemu-system-ppc
160 MACHINE_SUBTYPE=prep
161 CPU_SUBTYPE=603e
162 BIOS=powerpc_rom.bin
163 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic"
164 if [ "$TYPE" = "ext3" ]; then
165 KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
166 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $HDIMAGE -no-reboot $QEMU_UI_OPTIONS"
167 fi
168fi
169
143if [ "$MACHINE" = "akita" ]; then 170if [ "$MACHINE" = "akita" ]; then
144 QEMU=qemu-system-arm 171 QEMU=qemu-system-arm
145 if [ "$TYPE" = "jffs2" ]; then 172 if [ "$TYPE" = "jffs2" ]; then
diff --git a/scripts/runqemu b/scripts/runqemu
index 5b44402579..25d30c98a9 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -102,6 +102,32 @@ if [ "$MACHINE" = "qemuarm" ]; then
102 fi 102 fi
103fi 103fi
104 104
105if [ "$MACHINE" = "qemumips" ]; then
106 if [ "x$ZIMAGE" = "x" ]; then
107 ZIMAGE=$BUILDDIR/tmp/deploy/images/vmlinux.bin-$MACHINE.bin
108 fi
109 if [ "$TYPE" = "ext3" ]; then
110 if [ "x$HDIMAGE" = "x" ]; then
111 T=$BUILDDIR/tmp/deploy/images
112 findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal"
113 fi
114 fi
115 CROSSPATH=$BUILDDIR/tmp/sysroots/$BUILD_SYS/usr
116fi
117
118if [ "$MACHINE" = "qemuppc" ]; then
119 if [ "x$ZIMAGE" = "x" ]; then
120 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
121 fi
122 if [ "$TYPE" = "ext3" ]; then
123 if [ "x$HDIMAGE" = "x" ]; then
124 T=$BUILDDIR/tmp/deploy/images
125 findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal"
126 fi
127 fi
128 CROSSPATH=$BUILDDIR/tmp/sysroots/$BUILD_SYS/usr
129fi
130
105if [ "$MACHINE" = "spitz" ]; then 131if [ "$MACHINE" = "spitz" ]; then
106 if [ "$TYPE" = "ext3" ]; then 132 if [ "$TYPE" = "ext3" ]; then
107 if [ "x$HDIMAGE" = "x" ]; then 133 if [ "x$HDIMAGE" = "x" ]; then
@@ -144,6 +170,8 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
144 TARGET_SYS="arm-poky-linux" 170 TARGET_SYS="arm-poky-linux"
145elif [ "$MACHINE" = "qemux86" ]; then 171elif [ "$MACHINE" = "qemux86" ]; then
146 TARGET_SYS="i586-poky-linux" 172 TARGET_SYS="i586-poky-linux"
173elif [ "$MACHINE" = "qemumips" ]; then
174 TARGET_SYS="mips-poky-linux"
147fi 175fi
148 176
149if [ ! -e $CROSSPATH/$TARGET_SYS/bin/cc ]; then 177if [ ! -e $CROSSPATH/$TARGET_SYS/bin/cc ]; then