Patchwork [v2] runqemu/mips: adjust runqemu script to support mipsel machine

login
mail settings
Submitter Dennis Lan
Date July 12, 2012, 9:58 a.m.
Message ID <1342087131-14277-1-git-send-email-dennis.yxun@gmail.com>
Download mbox | patch
Permalink /patch/31795/
State Accepted
Commit a12e2409af246d4c1d0e0c9a2457fb9c850bd8ca
Headers show

Comments

Dennis Lan - July 12, 2012, 9:58 a.m.
Signed-off-by: Dennis Lan <dennis.yxun@gmail.com>
---
 scripts/runqemu          |    5 ++++-
 scripts/runqemu-internal |   13 +++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
Saul Wold - July 17, 2012, 4:20 p.m.
On 07/12/2012 02:58 AM, Dennis Lan wrote:
> Signed-off-by: Dennis Lan <dennis.yxun@gmail.com>
> ---
>   scripts/runqemu          |    5 ++++-
>   scripts/runqemu-internal |   13 +++++++------
>   2 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 8d149a2..650d1df 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -94,7 +94,7 @@ KVM_ENABLED="no"
>   while true; do
>       arg=${1}
>       case "$arg" in
> -        "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4"  | "qemuppc")
> +        "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4"  | "qemuppc")
>               [ -z "$MACHINE" ] && MACHINE=$arg || \
>                   error "conflicting MACHINE types [$MACHINE] and [$arg]"
>               ;;
> @@ -245,6 +245,9 @@ QEMUARM_DEFAULT_FSTYPE=ext3
>   QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
>   QEMUMIPS_DEFAULT_FSTYPE=ext3
>
> +QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
> +QEMUMIPSEL_DEFAULT_FSTYPE=ext3
> +
>   QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
>   QEMUMIPS64_DEFAULT_FSTYPE=ext3
>
> diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
> index 041464d..a21ea93 100755
> --- a/scripts/runqemu-internal
> +++ b/scripts/runqemu-internal
> @@ -236,6 +236,7 @@ fi
>   case "$MACHINE" in
>       "qemuarm") ;;
>       "qemumips") ;;
> +    "qemumipsel") ;;
>       "qemumips64") ;;
>       "qemush4") ;;
>       "qemuppc") ;;
> @@ -375,12 +376,12 @@ if [ "$MACHINE" = "spitz" ]; then
>       fi
>   fi
>
> -if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then
> -    if [ "$MACHINE" = "qemumips64" ]; then
> -	QEMU=qemu-system-mips64
> -    else
> -	QEMU=qemu-system-mips
> -    fi
> +if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
> +    case "$MACHINE" in
> +       qemumips)   QEMU=qemu-system-mips ;;
> +       qemumipsel) QEMU=qemu-system-mipsel ;;
> +       qemumips64) QEMU=qemu-system-mips64 ;;
> +    esac
>       MACHINE_SUBTYPE=malta
>       QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
>       if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
>

Merged into OE-Core

Thanks
	Sau!
Dennis Lan - July 17, 2012, 9:12 p.m.
hi saul:
   thanks for taking this

Dennis

On Wed, Jul 18, 2012 at 12:20 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 07/12/2012 02:58 AM, Dennis Lan wrote:
>>
>> Signed-off-by: Dennis Lan <dennis.yxun@gmail.com>
>> ---
>>   scripts/runqemu          |    5 ++++-
>>   scripts/runqemu-internal |   13 +++++++------
>>   2 files changed, 11 insertions(+), 7 deletions(-)
>>
>> diff --git a/scripts/runqemu b/scripts/runqemu
>> index 8d149a2..650d1df 100755
>> --- a/scripts/runqemu
>> +++ b/scripts/runqemu
>> @@ -94,7 +94,7 @@ KVM_ENABLED="no"
>>   while true; do
>>       arg=${1}
>>       case "$arg" in
>> -        "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64"
>> | "qemush4"  | "qemuppc")
>> +        "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel"
>> | "qemumips64" | "qemush4"  | "qemuppc")
>>               [ -z "$MACHINE" ] && MACHINE=$arg || \
>>                   error "conflicting MACHINE types [$MACHINE] and [$arg]"
>>               ;;
>> @@ -245,6 +245,9 @@ QEMUARM_DEFAULT_FSTYPE=ext3
>>   QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
>>   QEMUMIPS_DEFAULT_FSTYPE=ext3
>>
>> +QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
>> +QEMUMIPSEL_DEFAULT_FSTYPE=ext3
>> +
>>   QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
>>   QEMUMIPS64_DEFAULT_FSTYPE=ext3
>>
>> diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
>> index 041464d..a21ea93 100755
>> --- a/scripts/runqemu-internal
>> +++ b/scripts/runqemu-internal
>> @@ -236,6 +236,7 @@ fi
>>   case "$MACHINE" in
>>       "qemuarm") ;;
>>       "qemumips") ;;
>> +    "qemumipsel") ;;
>>       "qemumips64") ;;
>>       "qemush4") ;;
>>       "qemuppc") ;;
>> @@ -375,12 +376,12 @@ if [ "$MACHINE" = "spitz" ]; then
>>       fi
>>   fi
>>
>> -if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then
>> -    if [ "$MACHINE" = "qemumips64" ]; then
>> -       QEMU=qemu-system-mips64
>> -    else
>> -       QEMU=qemu-system-mips
>> -    fi
>> +if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" =
>> "qemumips64" ]; then
>> +    case "$MACHINE" in
>> +       qemumips)   QEMU=qemu-system-mips ;;
>> +       qemumipsel) QEMU=qemu-system-mipsel ;;
>> +       qemumips64) QEMU=qemu-system-mips64 ;;
>> +    esac
>>       MACHINE_SUBTYPE=malta
>>       QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
>>       if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
>>
>
> Merged into OE-Core
>
> Thanks
>         Sau!

Patch

diff --git a/scripts/runqemu b/scripts/runqemu
index 8d149a2..650d1df 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -94,7 +94,7 @@  KVM_ENABLED="no"
 while true; do
     arg=${1}
     case "$arg" in
-        "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumips64" | "qemush4"  | "qemuppc")
+        "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4"  | "qemuppc")
             [ -z "$MACHINE" ] && MACHINE=$arg || \
                 error "conflicting MACHINE types [$MACHINE] and [$arg]"
             ;;
@@ -245,6 +245,9 @@  QEMUARM_DEFAULT_FSTYPE=ext3
 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
 QEMUMIPS_DEFAULT_FSTYPE=ext3
 
+QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
+QEMUMIPSEL_DEFAULT_FSTYPE=ext3
+
 QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
 QEMUMIPS64_DEFAULT_FSTYPE=ext3
 
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 041464d..a21ea93 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -236,6 +236,7 @@  fi
 case "$MACHINE" in
     "qemuarm") ;;
     "qemumips") ;;
+    "qemumipsel") ;;
     "qemumips64") ;;
     "qemush4") ;;
     "qemuppc") ;;
@@ -375,12 +376,12 @@  if [ "$MACHINE" = "spitz" ]; then
     fi
 fi
 
-if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumips64" ]; then
-    if [ "$MACHINE" = "qemumips64" ]; then
-	QEMU=qemu-system-mips64
-    else
-	QEMU=qemu-system-mips
-    fi
+if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
+    case "$MACHINE" in
+       qemumips)   QEMU=qemu-system-mips ;;
+       qemumipsel) QEMU=qemu-system-mipsel ;;
+       qemumips64) QEMU=qemu-system-mips64 ;;
+    esac
     MACHINE_SUBTYPE=malta
     QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
     if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then