From patchwork Mon Feb 8 18:53:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 580469 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 9CEF5140C72 for ; Tue, 9 Feb 2016 05:53:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754685AbcBHSxz (ORCPT ); Mon, 8 Feb 2016 13:53:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35547 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754455AbcBHSxs (ORCPT ); Mon, 8 Feb 2016 13:53:48 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id CDBC2C0ABF2D; Mon, 8 Feb 2016 18:53:48 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-158.brq.redhat.com [10.34.1.158]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u18IrHb2006285; Mon, 8 Feb 2016 13:53:46 -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 Subject: [kvm-unit-tests PATCH v2 12/14] mkstandalone: add support for powerpc Date: Mon, 8 Feb 2016 19:53:12 +0100 Message-Id: <1454957594-30601-13-git-send-email-drjones@redhat.com> In-Reply-To: <1454957594-30601-1-git-send-email-drjones@redhat.com> References: <1454957594-30601-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 --- configure | 2 ++ powerpc/run | 4 ++-- scripts/mkstandalone.sh | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) 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 b317c6c0dc62e..4509429f9712b 100755 --- a/powerpc/run +++ b/powerpc/run @@ -40,8 +40,8 @@ if ! $qemu -machine '?' 2>&1 | grep 'pseries' > /dev/null; then exit 2 fi -boot_rom='powerpc/boot_rom.bin' -if [ -f powerpc/rom/boot_rom.bin ]; then +boot_rom=$FIRMWARE +if [ -z "$STANDALONE" ] && [ -f powerpc/rom/boot_rom.bin ]; then boot_rom='powerpc/rom/boot_rom.bin' fi 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"