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é <philmd@redhat.com>
---
 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
-- 
2.20.1

On Mon, Aug 12, 2019 at 01:37:38PM +0200, Philippe Mathieu-Daudé wrote:
> 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

Doesn't apply, needs a rebase.

cheers,
  Gerd

Hi Gerd,

On 8/21/19 11:00 AM, Gerd Hoffmann wrote:
> On Mon, Aug 12, 2019 at 01:37:38PM +0200, Philippe Mathieu-Daudé wrote:
>> 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
> 
> Doesn't apply, needs a rebase.

Laurent fixed the trivial conflict in patch #1.

Since patch #2 depends of patch #1, can you Ack it so Laurent queue it
in his trivial queue?

Thanks,

Phil.

Le 21/08/2019 à 12:31, Philippe Mathieu-Daudé a écrit :
> Hi Gerd,
> 
> On 8/21/19 11:00 AM, Gerd Hoffmann wrote:
>> On Mon, Aug 12, 2019 at 01:37:38PM +0200, Philippe Mathieu-Daudé wrote:
>>> 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
>>
>> Doesn't apply, needs a rebase.
> 
> Laurent fixed the trivial conflict in patch #1.
> 
> Since patch #2 depends of patch #1, can you Ack it so Laurent queue it
> in his trivial queue?

Patch #2 applies cleanly once the patch #1 is fixed.

Gerd, if you acknowledge it I add it to my queue.

Thanks,
Laurent

On Wed, Aug 21, 2019 at 12:47:07PM +0200, Laurent Vivier wrote:
> Le 21/08/2019 à 12:31, Philippe Mathieu-Daudé a écrit :
> > Hi Gerd,
> > 
> > On 8/21/19 11:00 AM, Gerd Hoffmann wrote:
> >> On Mon, Aug 12, 2019 at 01:37:38PM +0200, Philippe Mathieu-Daudé wrote:
> >>> 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
> >>
> >> Doesn't apply, needs a rebase.
> > 
> > Laurent fixed the trivial conflict in patch #1.
> > 
> > Since patch #2 depends of patch #1, can you Ack it so Laurent queue it
> > in his trivial queue?
> 
> Patch #2 applies cleanly once the patch #1 is fixed.
> 
> Gerd, if you acknowledge it I add it to my queue.

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

On 8/12/19 1:37 PM, Philippe Mathieu-Daudé wrote:
> 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 objectts
Reviewed-by: Thomas Huth <thuth@redhat.com>