hw/core: Add a config switch for the "register" device

The "register" device is only used by certain machines. Let's add
a proper config switch for it so that it only gets compiled when we
really need it.

Message-Id: <20190817101931[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Alistair Francis <[email protected]>
Signed-off-by: Thomas Huth <[email protected]>

diff --git a/hw/Kconfig b/hw/Kconfig
index dbae1c08526361fc790b9e20e6e0c8c9a32fab34..b45db3c813ff04497e0082b8e9a994b4537b0f38 100644 (file)
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -76,3 +76,4 @@ config XILINX_AXI
 
 config XLNX_ZYNQMP
     bool
+    select REGISTER

diff --git a/hw/core/Kconfig b/hw/core/Kconfig
index c2a1ae81221c48fecbfe5ee04b339a9c053221fe..d11920fcb333811d2158293d5c16da724d28f35f 100644 (file)
--- a/hw/core/Kconfig
+++ b/hw/core/Kconfig
@@ -9,3 +9,6 @@ config FITLOADER
 
 config PLATFORM_BUS
     bool
+
+config REGISTER
+    bool

diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index f8481d959f6068cb0c4e38dfeaf0d70240ffa634..d6cfb2a81b2456304206adbc6b9930f5882e5cc8 100644 (file)
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -17,7 +17,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_SOFTMMU) += or-irq.o
 common-obj-$(CONFIG_SOFTMMU) += split-irq.o
 common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o

diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
index 751dec54264094aba530dfe1e6cd948bd394745b..5c61b67bc0509e7fcdcfda3cdc867b4b0cb544ab 100644 (file)
--- a/hw/dma/Kconfig
+++ b/hw/dma/Kconfig
@@ -16,6 +16,7 @@ config I8257
 
 config ZYNQ_DEVCFG
     bool
+    select REGISTER
 
 config STP2000
     bool