If the user only wants to compile targets that do not require the "register" device, we should also not compile register.c. Add a proper CONFIG_REGISTER switch to be able to choose this more flexibly.
Signed-off-by: Thomas Huth <th...@redhat.com> --- default-configs/arm-softmmu.mak | 1 + default-configs/microblaze-softmmu.mak | 1 + hw/core/Makefile.objs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index a3a3b66..6f2ffc1 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -6,6 +6,7 @@ CONFIG_VGA=y CONFIG_NAND=y CONFIG_OR_IRQ=y CONFIG_SPLIT_IRQ=y +CONFIG_REGISTER=y CONFIG_ECC=y CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index 7fca8e4..b5c5659 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -10,3 +10,4 @@ CONFIG_XILINX_ETHLITE=y CONFIG_SSI=y CONFIG_SSI_M25P80=y CONFIG_XLNX_ZYNQMP=y +CONFIG_REGISTER=y diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index cafbe01..cb7c149 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -16,7 +16,7 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_FITLOADER) += loader-fit.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o -common-obj-$(CONFIG_SOFTMMU) += register.o +common-obj-$(CONFIG_REGISTER) += register.o common-obj-$(CONFIG_OR_IRQ) += or-irq.o common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o -- 1.8.3.1
