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.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/core/Kconfig | 3 +++
hw/core/Makefile.objs | 2 +-
hw/dma/Kconfig | 1 +
hw/timer/Kconfig | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/core/Kconfig b/hw/core/Kconfig
index c2a1ae8122..d11920fcb3 100644
--- 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 a799c83815..d493a051ee 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_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 751dec5426..5c61b67bc0 100644
--- a/hw/dma/Kconfig
+++ b/hw/dma/Kconfig
@@ -16,6 +16,7 @@ config I8257
config ZYNQ_DEVCFG
bool
+ select REGISTER
config STP2000
bool
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 51921eb63f..f575481210 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -36,6 +36,7 @@ config TWL92230
config XLNX_ZYNQMP
bool
+ select REGISTER
config ALTERA_TIMER
bool
--
2.21.0
On 5/14/19 12:00 PM, Thomas Huth wrote: > 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. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > hw/core/Kconfig | 3 +++ > hw/core/Makefile.objs | 2 +- > hw/dma/Kconfig | 1 + > hw/timer/Kconfig | 1 + > 4 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/hw/core/Kconfig b/hw/core/Kconfig > index c2a1ae8122..d11920fcb3 100644 > --- 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 a799c83815..d493a051ee 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_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 751dec5426..5c61b67bc0 100644 > --- a/hw/dma/Kconfig > +++ b/hw/dma/Kconfig > @@ -16,6 +16,7 @@ config I8257 > > config ZYNQ_DEVCFG > bool > + select REGISTER > > config STP2000 > bool > diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig > index 51921eb63f..f575481210 100644 > --- a/hw/timer/Kconfig > +++ b/hw/timer/Kconfig > @@ -36,6 +36,7 @@ config TWL92230 > > config XLNX_ZYNQMP > bool > + select REGISTER > > config ALTERA_TIMER > bool > Annoying, this clashes with "hw/microblaze: Kconfig cleanup" which is already queued by Paolo: https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04669.html
On 14/05/2019 12.31, Philippe Mathieu-Daudé wrote: > On 5/14/19 12:00 PM, Thomas Huth wrote: >> 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. >> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> hw/core/Kconfig | 3 +++ >> hw/core/Makefile.objs | 2 +- >> hw/dma/Kconfig | 1 + >> hw/timer/Kconfig | 1 + >> 4 files changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/hw/core/Kconfig b/hw/core/Kconfig >> index c2a1ae8122..d11920fcb3 100644 >> --- 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 a799c83815..d493a051ee 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_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 751dec5426..5c61b67bc0 100644 >> --- a/hw/dma/Kconfig >> +++ b/hw/dma/Kconfig >> @@ -16,6 +16,7 @@ config I8257 >> >> config ZYNQ_DEVCFG >> bool >> + select REGISTER >> >> config STP2000 >> bool >> diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig >> index 51921eb63f..f575481210 100644 >> --- a/hw/timer/Kconfig >> +++ b/hw/timer/Kconfig >> @@ -36,6 +36,7 @@ config TWL92230 >> >> config XLNX_ZYNQMP >> bool >> + select REGISTER >> >> config ALTERA_TIMER >> bool >> > > Annoying, this clashes with "hw/microblaze: Kconfig cleanup" which is > already queued by Paolo: > https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04669.html Ok, I'll wait for the merge of Paolo's next PULL request before sending the v2 of my series. Thomas
On 14/05/2019 12.38, Thomas Huth wrote: > On 14/05/2019 12.31, Philippe Mathieu-Daudé wrote: >> On 5/14/19 12:00 PM, Thomas Huth wrote: >>> 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. >>> >>> Signed-off-by: Thomas Huth <thuth@redhat.com> >>> --- >>> hw/core/Kconfig | 3 +++ >>> hw/core/Makefile.objs | 2 +- >>> hw/dma/Kconfig | 1 + >>> hw/timer/Kconfig | 1 + >>> 4 files changed, 6 insertions(+), 1 deletion(-) >>> >>> diff --git a/hw/core/Kconfig b/hw/core/Kconfig >>> index c2a1ae8122..d11920fcb3 100644 >>> --- 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 a799c83815..d493a051ee 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_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 751dec5426..5c61b67bc0 100644 >>> --- a/hw/dma/Kconfig >>> +++ b/hw/dma/Kconfig >>> @@ -16,6 +16,7 @@ config I8257 >>> >>> config ZYNQ_DEVCFG >>> bool >>> + select REGISTER >>> >>> config STP2000 >>> bool >>> diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig >>> index 51921eb63f..f575481210 100644 >>> --- a/hw/timer/Kconfig >>> +++ b/hw/timer/Kconfig >>> @@ -36,6 +36,7 @@ config TWL92230 >>> >>> config XLNX_ZYNQMP >>> bool >>> + select REGISTER >>> >>> config ALTERA_TIMER >>> bool >>> >> >> Annoying, this clashes with "hw/microblaze: Kconfig cleanup" which is >> already queued by Paolo: >> https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04669.html > > Ok, I'll wait for the merge of Paolo's next PULL request before sending > the v2 of my series. Looks like your patches were not included in Paolo's last PULL request? Did the patches fall through the cracks? Thomas
© 2016 - 2026 Red Hat, Inc.