summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDennis Lan <dennis.yxun@gmail.com>2012-07-11 07:05:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:54 +0100
commit521cf2094242a74f5f098426d9b61cabd4adee0f (patch)
tree0ca37feb2f21bbae2edf459850b8d2046e4f06f3 /scripts
parent6c401a907c16401b524cc7fb21b345eece5fead0 (diff)
downloadpoky-521cf2094242a74f5f098426d9b61cabd4adee0f.tar.gz
runqemu/mips: adjust runqemu script to support mipsel machine
(From OE-Core rev: a12e2409af246d4c1d0e0c9a2457fb9c850bd8ca) Signed-off-by: Dennis Lan <dennis.yxun@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu5
-rwxr-xr-xscripts/runqemu-internal13
2 files changed, 11 insertions, 7 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 8d149a2f3c..650d1df806 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -94,7 +94,7 @@ KVM_ENABLED="no"
94while true; do 94while true; do
95 arg=${1} 95 arg=${1}
96 case "$arg" in 96 case "$arg" in
97 "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4" | "qemuppc") 97 "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4" | "qemuppc")
98 [ -z "$MACHINE" ] && MACHINE=$arg || \ 98 [ -z "$MACHINE" ] && MACHINE=$arg || \
99 error "conflicting MACHINE types [$MACHINE] and [$arg]" 99 error "conflicting MACHINE types [$MACHINE] and [$arg]"
100 ;; 100 ;;
@@ -245,6 +245,9 @@ QEMUARM_DEFAULT_FSTYPE=ext3
245QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin 245QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
246QEMUMIPS_DEFAULT_FSTYPE=ext3 246QEMUMIPS_DEFAULT_FSTYPE=ext3
247 247
248QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
249QEMUMIPSEL_DEFAULT_FSTYPE=ext3
250
248QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin 251QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
249QEMUMIPS64_DEFAULT_FSTYPE=ext3 252QEMUMIPS64_DEFAULT_FSTYPE=ext3
250 253
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 041464dd7c..a21ea93c9b 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -236,6 +236,7 @@ fi
236case "$MACHINE" in 236case "$MACHINE" in
237 "qemuarm") ;; 237 "qemuarm") ;;
238 "qemumips") ;; 238 "qemumips") ;;
239 "qemumipsel") ;;
239 "qemumips64") ;; 240 "qemumips64") ;;
240 "qemush4") ;; 241 "qemush4") ;;
241 "qemuppc") ;; 242 "qemuppc") ;;
@@ -375,12 +376,12 @@ if [ "$MACHINE" = "spitz" ]; then
375 fi 376 fi
376fi 377fi
377 378
378if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then 379if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
379 if [ "$MACHINE" = "qemumips64" ]; then 380 case "$MACHINE" in
380 QEMU=qemu-system-mips64 381 qemumips) QEMU=qemu-system-mips ;;
381 else 382 qemumipsel) QEMU=qemu-system-mipsel ;;
382 QEMU=qemu-system-mips 383 qemumips64) QEMU=qemu-system-mips64 ;;
383 fi 384 esac
384 MACHINE_SUBTYPE=malta 385 MACHINE_SUBTYPE=malta
385 QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" 386 QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
386 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 387 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then