From patchwork Mon Feb 29 12:47:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 589920 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D5D48140BCC for ; Mon, 29 Feb 2016 23:49:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751353AbcB2MtW (ORCPT ); Mon, 29 Feb 2016 07:49:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39275 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750772AbcB2MtW (ORCPT ); Mon, 29 Feb 2016 07:49:22 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id E76AAC0005D1; Mon, 29 Feb 2016 12:49:21 +0000 (UTC) Received: from hawk.localdomain.com (ovpn-116-111.ams2.redhat.com [10.36.116.111]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1TClvMD024439; Mon, 29 Feb 2016 07:49:17 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com, rkrcmar@redhat.com Subject: [kvm-unit-tests PATCH v7 16/18] mkstandalone: add support for powerpc Date: Mon, 29 Feb 2016 13:47:50 +0100 Message-Id: <1456750072-7524-17-git-send-email-drjones@redhat.com> In-Reply-To: <1456750072-7524-1-git-send-email-drjones@redhat.com> References: <1456750072-7524-1-git-send-email-drjones@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org PowerPC needs firmware. Signed-off-by: Andrew Jones Reviewed-by: Radim Krčmář Reviewed-by: David Gibson --- 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'