Commit 0bbabbb4 authored by Thomas Huth's avatar Thomas Huth Committed by Peter Maydell
Browse files

hw/arm: Use more CONFIG switches for the object files 



A lot of ARM object files are linked into the executable unconditionally,
even though we have corresponding CONFIG switches like CONFIG_PXA2XX or
CONFIG_OMAP. We should make sure to use these switches in the Makefile so
that the users can disable certain unwanted boards and devices more easily.
While we're at it, also add some new switches for the boards that do not
have a CONFIG option yet.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-id: 1520266949-29817-1-git-send-email-thuth@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 8c5931de

default-configs/arm-softmmu.mak

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_A9MPCORE=y 
CONFIG_A15MPCORE=y



CONFIG_ARM_V7M=y

CONFIG_NETDUINO2=y



CONFIG_ARM_GIC=y

CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
@@ -109,6 +110,7 @@ CONFIG_TZ_PPC=y 
CONFIG_IOTKIT=y

CONFIG_IOTKIT_SECCTL=y



CONFIG_VERSATILE=y

CONFIG_VERSATILE_PCI=y

CONFIG_VERSATILE_I2C=y
@@ -117,6 +119,7 @@ CONFIG_VFIO_XGMAC=y 
CONFIG_VFIO_AMD_XGBE=y



CONFIG_SDHCI=y

CONFIG_INTEGRATOR=y

CONFIG_INTEGRATOR_DEBUG=y



CONFIG_ALLWINNER_A10_PIT=y
@@ -142,3 +145,7 @@ CONFIG_MSF2=y 
CONFIG_FW_CFG_DMA=y

CONFIG_XILINX_AXI=y

CONFIG_PCI_DESIGNWARE=y



CONFIG_STRONGARM=y

CONFIG_HIGHBANK=y

CONFIG_MUSICPAL=y

hw/arm/Makefile.objs

+21 −9
Original line number Diff line number Diff line 
obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o

obj-$(CONFIG_DIGIC) += digic_boards.o

obj-y += integratorcp.o mainstone.o musicpal.o nseries.o

obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o

obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o

obj-y += boot.o virt.o sysbus-fdt.o

obj-$(CONFIG_ACPI) += virt-acpi-build.o

obj-y += netduino2.o

obj-y += sysbus-fdt.o

obj-$(CONFIG_DIGIC) += digic_boards.o

obj-$(CONFIG_EXYNOS4) += exynos4_boards.o

obj-$(CONFIG_HIGHBANK) += highbank.o

obj-$(CONFIG_INTEGRATOR) += integratorcp.o

obj-$(CONFIG_MAINSTONE) += mainstone.o

obj-$(CONFIG_MUSICPAL) += musicpal.o

obj-$(CONFIG_NETDUINO2) += netduino2.o

obj-$(CONFIG_NSERIES) += nseries.o

obj-$(CONFIG_OMAP) += omap_sx1.o palm.o

obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o

obj-$(CONFIG_REALVIEW) += realview.o

obj-$(CONFIG_STELLARIS) += stellaris.o

obj-$(CONFIG_STRONGARM) += collie.o

obj-$(CONFIG_VERSATILE) += vexpress.o versatilepb.o

obj-$(CONFIG_ZYNQ) += xilinx_zynq.o



obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o

obj-$(CONFIG_ARM_V7M) += armv7m.o

obj-$(CONFIG_EXYNOS4) += exynos4210.o

obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o

obj-$(CONFIG_DIGIC) += digic.o

obj-y += omap1.o omap2.o strongarm.o

obj-$(CONFIG_OMAP) += omap1.o omap2.o

obj-$(CONFIG_STRONGARM) += 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