From patchwork Mon Aug 12 11:37:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1145681 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 466Ykf3Llfz9sN6 for ; Mon, 12 Aug 2019 21:38:18 +1000 (AEST) Received: from localhost ([::1]:44482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx8eW-0002yj-Hg for incoming@patchwork.ozlabs.org; Mon, 12 Aug 2019 07:38:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36106) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx8eC-0002u2-2n for qemu-devel@nongnu.org; Mon, 12 Aug 2019 07:37:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hx8eB-0008MD-4v for qemu-devel@nongnu.org; Mon, 12 Aug 2019 07:37:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53874) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hx8eA-0008Lf-Vu; Mon, 12 Aug 2019 07:37:55 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4039E308C381; Mon, 12 Aug 2019 11:37:54 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-96.brq.redhat.com [10.40.204.96]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E5235D9CA; Mon, 12 Aug 2019 11:37:51 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 12 Aug 2019 13:37:37 +0200 Message-Id: <20190812113739.16587-2-philmd@redhat.com> In-Reply-To: <20190812113739.16587-1-philmd@redhat.com> References: <20190812113739.16587-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 12 Aug 2019 11:37:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] hw/display/sm501: Remove unused include X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Markus Armbruster , qemu-ppc@nongnu.org, Gerd Hoffmann , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The "cpu.h" include makes devices target-specific. Since it is not used, remove it, so the device become generic (we can now compile it once for all targets). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/display/sm501.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 5918f59b2b..b15fb1ab00 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "cpu.h" #include "hw/hw.h" #include "hw/char/serial.h" #include "ui/console.h" From patchwork Mon Aug 12 11:37:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1145682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 466Ykr15nMz9sN6 for ; Mon, 12 Aug 2019 21:38:28 +1000 (AEST) Received: from localhost ([::1]:44489 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx8eg-0003Ra-7b for incoming@patchwork.ozlabs.org; Mon, 12 Aug 2019 07:38:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36129) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hx8eF-00031S-0u for qemu-devel@nongnu.org; Mon, 12 Aug 2019 07:37:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hx8eD-0008Ny-Vm for qemu-devel@nongnu.org; Mon, 12 Aug 2019 07:37:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hx8eD-0008Na-Qj; Mon, 12 Aug 2019 07:37:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 25162182D; Mon, 12 Aug 2019 11:37:57 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-96.brq.redhat.com [10.40.204.96]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB8D55D9CA; Mon, 12 Aug 2019 11:37:54 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 12 Aug 2019 13:37:38 +0200 Message-Id: <20190812113739.16587-3-philmd@redhat.com> In-Reply-To: <20190812113739.16587-1-philmd@redhat.com> References: <20190812113739.16587-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 12 Aug 2019 11:37:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] hw/display: Compile various display devices as common object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Markus Armbruster , qemu-ppc@nongnu.org, Gerd Hoffmann , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Various display devices are not target-specific and can be compiled once for all the targets. After this commit, the 'make world' target is reduced by 54 objects Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Gerd Hoffmann --- hw/display/Makefile.objs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index a64998fc7b..0f11d55b14 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -31,13 +31,13 @@ obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS) milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS) -obj-$(CONFIG_OMAP) += omap_dss.o +common-obj-$(CONFIG_OMAP) += omap_dss.o obj-$(CONFIG_OMAP) += omap_lcdc.o -obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o -obj-$(CONFIG_RASPI) += bcm2835_fb.o -obj-$(CONFIG_SM501) += sm501.o -obj-$(CONFIG_TCX) += tcx.o -obj-$(CONFIG_CG3) += cg3.o +common-obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o +common-obj-$(CONFIG_RASPI) += bcm2835_fb.o +common-obj-$(CONFIG_SM501) += sm501.o +common-obj-$(CONFIG_TCX) += tcx.o +common-obj-$(CONFIG_CG3) += cg3.o obj-$(CONFIG_VGA) += vga.o @@ -53,7 +53,7 @@ virtio-gpu.o-cflags := $(VIRGL_CFLAGS) virtio-gpu.o-libs += $(VIRGL_LIBS) virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) virtio-gpu-3d.o-libs += $(VIRGL_LIBS) -obj-$(CONFIG_DPCD) += dpcd.o -obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o +common-obj-$(CONFIG_DPCD) += dpcd.o +common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o -obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o +common-obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o