From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Subject: [kvm-unit-tests PATCH v5 16/18] mkstandalone: add support for powerpc Date: Wed, 17 Feb 2016 19:40:57 +0100 Message-ID: <1455734459-31902-17-git-send-email-drjones@redhat.com> References: <1455734459-31902-1-git-send-email-drjones@redhat.com> Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:39625 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933295AbcBQSlo (ORCPT ); Wed, 17 Feb 2016 13:41:44 -0500 In-Reply-To: <1455734459-31902-1-git-send-email-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: PowerPC needs firmware. Signed-off-by: Andrew Jones --- 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..c7e78f83fb086 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -53,6 +53,11 @@ generate_test () echo "trap 'rm -f \$cleanup' EXIT" + if [ "$FIRMWARE" ]; then + temp_file FIRMWARE "$FIRMWARE" + echo 'export FIRMWARE' + fi + temp_file bin "$kernel" args[3]='$bin' -- 2.4.3