Skip to contentSkip to conversation

hw/dma: Compile the bcm2835_dma device as common object

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Apr 27, 2019 – Apr 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/dma: Compile the bcm2835_dma device as common object

This device is used by both ARM (BCM2836, for raspi2) and AArch64 (BCM2837, for raspi3) targets, and is not CPU-specific. Move it to common object, so we build it once for all targets.

---
 hw/dma/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/dma/Makefile.objs +1 -1
index 79affecc390..8b39f9c6004 100644
@@ -14,4 +14,4 @@ common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
 
 obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
 obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
-obj-$(CONFIG_RASPI) += bcm2835_dma.o
+common-obj-$(CONFIG_RASPI) += bcm2835_dma.o
Signature · 1 line
2.20.1
#1 lore raw
Quoted 15 lines · Philippe Mathieu-Daudé

This device is used by both ARM (BCM2836, for raspi2) and AArch64 (BCM2837, for raspi3) targets, and is not CPU-specific. Move it to common object, so we build it once for all targets.

---
 hw/dma/Makefile.objs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/dma/Makefile.objs +0 -0
index 79affecc390..8b39f9c6004 100644

hw/dma/Makefile.objs common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o · line 17

Quoted 5 lines
hw/dma/Makefile.objs +1 -1
@@ -14,4 +14,4 @@ common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
 
 obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
 obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
-obj-$(CONFIG_RASPI) += bcm2835_dma.o
+common-obj-$(CONFIG_RASPI) += bcm2835_dma.o

Applied to target-arm.next, thanks.

-- PMM