From patchwork Tue Apr 23 11:23:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 238890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 87BAF2C0173 for ; Tue, 23 Apr 2013 21:24:43 +1000 (EST) Received: from localhost ([::1]:32857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUbKz-0002KY-P6 for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 07:24:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUbJO-00006k-Mq for qemu-devel@nongnu.org; Tue, 23 Apr 2013 07:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUbJH-0000bD-Mu for qemu-devel@nongnu.org; Tue, 23 Apr 2013 07:23:02 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:44950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUbJH-0000ap-D7 for qemu-devel@nongnu.org; Tue, 23 Apr 2013 07:22:55 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Apr 2013 12:17:44 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 23 Apr 2013 12:17:42 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 56C351B08079 for ; Tue, 23 Apr 2013 12:22:51 +0100 (BST) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3NBMfoO50593810 for ; Tue, 23 Apr 2013 11:22:41 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3NA6oPk018102 for ; Tue, 23 Apr 2013 06:06:50 -0400 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3NA6oYc018067; Tue, 23 Apr 2013 06:06:50 -0400 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id E1BD2122442F; Tue, 23 Apr 2013 13:22:49 +0200 (CEST) From: Christian Borntraeger To: Alexander Graf Date: Tue, 23 Apr 2013 13:23:03 +0200 Message-Id: <1366716185-36913-3-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366716185-36913-1-git-send-email-borntraeger@de.ibm.com> References: <1366658298-9275-1-git-send-email-agraf@suse.de> <1366716185-36913-1-git-send-email-borntraeger@de.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13042311-1948-0000-0000-000004F33A57 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.110 Cc: cornelia.huck@de.ibm.com, Christian Borntraeger , qemu-devel@nongnu.org, Dominik Dingel Subject: [Qemu-devel] [PATCH 2/4] s390-ccw.img: build s390-ccw rom on s3900 system by default X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Lets build the s390-ccw rom if on s390. Also fix the separate build folder case. Signed-off-by: Christian Borntraeger --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a382ff2..cb29b69 100755 --- a/configure +++ b/configure @@ -3320,6 +3320,10 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then roms="$roms spapr-rtas" fi +if test "$cpu" = "s390x" ; then + roms="$roms s390-ccw" +fi + # add pixman flags after all config tests are done QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags" libs_softmmu="$libs_softmmu $pixman_libs" @@ -4369,7 +4373,7 @@ fi # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" -DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" +DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" @@ -4377,6 +4381,7 @@ FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/lm32/Makefile po/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" +FILES="$FILES pc-bios/s390-ccw/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" FILES="$FILES pc-bios/qemu-icon.bmp" for bios_file in \