From patchwork Thu Aug 20 23:37:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 31784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2FF84B7B8A for ; Fri, 21 Aug 2009 09:43:25 +1000 (EST) Received: from localhost ([127.0.0.1]:51797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeHHj-0004qw-1I for incoming@patchwork.ozlabs.org; Thu, 20 Aug 2009 19:43:11 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MeHEH-00034x-Uk for qemu-devel@nongnu.org; Thu, 20 Aug 2009 19:39:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MeHEC-0002zD-67 for qemu-devel@nongnu.org; Thu, 20 Aug 2009 19:39:36 -0400 Received: from [199.232.76.173] (port=39419 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MeHEB-0002z0-W8 for qemu-devel@nongnu.org; Thu, 20 Aug 2009 19:39:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26062) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MeHEB-0006F6-BV for qemu-devel@nongnu.org; Thu, 20 Aug 2009 19:39:31 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7KNdU4o023781 for ; Thu, 20 Aug 2009 19:39:30 -0400 Received: from localhost.localdomain (vpn1-4-148.ams2.redhat.com [10.36.4.148]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7KNdQqj026026; Thu, 20 Aug 2009 19:39:29 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 21 Aug 2009 01:37:01 +0200 Message-Id: <26e9708a1f03d448132eba886ca3a724c465f437.1250810973.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 02/14] Configure ssi bus and devices only if arm-softmmu target is selected X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- Makefile | 9 +++++---- configure | 13 +++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f6bdf84..0540d1b 100644 --- a/Makefile +++ b/Makefile @@ -76,21 +76,22 @@ obj-y = $(block-obj-y) obj-y += readline.o console.o host-utils.o obj-y += irq.o ptimer.o -obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o max111x.o wm8750.o -obj-y += ssd0303.o ssd0323.o ads7846.o stellaris_input.o twl92230.o +obj-y += i2c.o smbus.o smbus_eeprom.o max7310.o wm8750.o +obj-y += ssd0303.o stellaris_input.o twl92230.o obj-y += tmp105.o lm832x.o eeprom93xx.o tsc2005.o obj-y += scsi-disk.o cdrom.o obj-y += scsi-generic.o obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o obj-y += usb-serial.o usb-net.o -obj-y += sd.o ssi-sd.o +obj-y += sd.o obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o obj-y += bt-hci-csr.o obj-y += buffered_file.o migration.o migration-tcp.o net.o qemu-sockets.o obj-y += qemu-char.o aio.o net-checksum.o savevm.o obj-y += msmouse.o ps2.o -obj-y += qdev.o qdev-properties.o ssi.o +obj-y += qdev.o qdev-properties.o +obj-$(CONFIG_SSI) += ssi.o ssi-sd.o max111x.o ssd0323.o ads7846.o obj-$(CONFIG_BRLAPI) += baum.o obj-$(CONFIG_WIN32) += tap-win32.o obj-$(CONFIG_POSIX) += migration-exec.o diff --git a/configure b/configure index e0928fe..fd02f54 100755 --- a/configure +++ b/configure @@ -1813,6 +1813,9 @@ if test -f ${config_host_ld}~ ; then fi fi +# What drivers should we compile +ssi_bus=no + for target in $target_list; do target_dir="$target" config_mak=$target_dir/config.mak @@ -2034,6 +2037,12 @@ fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_mak echo "LIBS+=$libs_softmmu" >> $config_mak + + case "$target_arch2" in + arm*) + ssi_bus=yes + ;; + esac fi if test "$target_user_only" = "yes" ; then echo "CONFIG_USER_ONLY=y" >> $config_mak @@ -2223,6 +2232,10 @@ fi done # for target in $targets +if test "$ssi_bus" = "yes" ; then + echo "CONFIG_SSI=y" >> $config_host_mak +fi + echo "/* Automatically generated by configure - do not modify */" > $config_host_h /bin/sh $source_path/create_config < $config_host_mak >> $config_host_h