[kvm-unit-tests,v4,15/17] mkstandalone: add support for powerpc
diff mbox

Message ID 1455544166-19766-16-git-send-email-drjones@redhat.com
State Superseded
Headers show

Commit Message

Andrew Jones Feb. 15, 2016, 1:49 p.m. UTC
PowerPC needs firmware.

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 configure               | 2 ++
 powerpc/run             | 2 +-
 scripts/mkstandalone.sh | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

Comments

Andrew Jones Feb. 17, 2016, 12:51 p.m. UTC | #1
On Mon, Feb 15, 2016 at 02:49:24PM +0100, Andrew Jones wrote:
> PowerPC needs firmware.
> 
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
>  configure               | 2 ++
>  powerpc/run             | 2 +-
>  scripts/mkstandalone.sh | 5 +++++
>  3 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index b2ad199da7873..7d5702e28d627 100755
> --- a/configure
> +++ b/configure
> @@ -83,6 +83,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
>      testdir=arm
>  elif [ "$arch" = "ppc64" ]; then
>      testdir=powerpc
> +    firmware="$testdir/boot_rom.bin"
>  else
>      testdir=$arch
>  fi
> @@ -137,4 +138,5 @@ OBJDUMP=$cross_prefix$objdump
>  AR=$cross_prefix$ar
>  API=$api
>  TEST_DIR=$testdir
> +FIRMWARE=$firmware
>  EOF
> diff --git a/powerpc/run b/powerpc/run
> index 47aecb7600832..c5108100fc5e0 100755
> --- a/powerpc/run
> +++ b/powerpc/run
> @@ -42,7 +42,7 @@ fi
>  
>  M='-machine pseries'
>  M+=",accel=$ACCEL"
> -command="$qemu $M -bios powerpc/boot_rom.bin"
> +command="$qemu $M -bios $FIRMWARE"
>  command+=" -display none -serial stdio -kernel"
>  echo $command "$@"
>  
> diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
> index b0f1e7c098afb..1788a8ef4e92a 100755
> --- a/scripts/mkstandalone.sh
> +++ b/scripts/mkstandalone.sh
> @@ -51,6 +51,11 @@ generate_test ()
>  		return 1
>  	fi
>  
> +	if [ "$FIRMWARE" ]; then
> +		temp_file firmware "$FIRMWARE"
> +		echo 'export FIRMWARE=$firmware'

Radim pointed out that there's no need for two firmware
(firmware,FIRMWARE) variables. As I need a v5 I'll throw
that change in too. (After which I'll expect his r-b :-)

drew
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/configure b/configure
index b2ad199da7873..7d5702e28d627 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,7 @@  elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
     testdir=arm
 elif [ "$arch" = "ppc64" ]; then
     testdir=powerpc
+    firmware="$testdir/boot_rom.bin"
 else
     testdir=$arch
 fi
@@ -137,4 +138,5 @@  OBJDUMP=$cross_prefix$objdump
 AR=$cross_prefix$ar
 API=$api
 TEST_DIR=$testdir
+FIRMWARE=$firmware
 EOF
diff --git a/powerpc/run b/powerpc/run
index 47aecb7600832..c5108100fc5e0 100755
--- a/powerpc/run
+++ b/powerpc/run
@@ -42,7 +42,7 @@  fi
 
 M='-machine pseries'
 M+=",accel=$ACCEL"
-command="$qemu $M -bios powerpc/boot_rom.bin"
+command="$qemu $M -bios $FIRMWARE"
 command+=" -display none -serial stdio -kernel"
 echo $command "$@"
 
diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
index b0f1e7c098afb..1788a8ef4e92a 100755
--- a/scripts/mkstandalone.sh
+++ b/scripts/mkstandalone.sh
@@ -51,6 +51,11 @@  generate_test ()
 		return 1
 	fi
 
+	if [ "$FIRMWARE" ]; then
+		temp_file firmware "$FIRMWARE"
+		echo 'export FIRMWARE=$firmware'
+	fi
+
 	echo "trap 'rm -f \$cleanup' EXIT"
 
 	temp_file bin "$kernel"