Commit 07c4a51a authored Jan 22, 2018 by Alistair Francis Committed by Edgar E. Iglesias Jan 26, 2018

aarch64-softmmu.mak: Use an ARM specific config



In preperation for having an ARM and MicroBlaze ZynqMP machine let's
split out the current ARM specific config options.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>

parent 133d23b3

default-configs/aarch64-softmmu.mak

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,3 +7,4 @@ CONFIG_AUX=y
		CONFIG_DDC=y
		CONFIG_DPCD=y
		CONFIG_XLNX_ZYNQMP=y
		CONFIG_XLNX_ZYNQMP_ARM=y

hw/arm/Makefile.objs

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ obj-y += omap1.o omap2.o strongarm.o
		obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
		obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o
		obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
		obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-zcu102.o
		obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o
		obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o
		obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
		obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o

hw/display/Makefile.objs

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,4 +40,4 @@ 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) += xlnx_dp.o
		obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o

hw/dma/Makefile.objs

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
		common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
		common-obj-$(CONFIG_STP2000) += sparc32_dma.o
		obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
		obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o

		obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
		obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o