| Message ID | 20191231183216.6781-14-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw: Fix various --without-default-devices issues | expand |
On Tue, Dec 31, 2019 at 07:32:15PM +0100, Philippe Mathieu-Daudé wrote: > Only the OpenBIOS and SLOF firmwares use the CHRP NVRAM layout. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/nvram/Kconfig | 4 ++++ > hw/nvram/Makefile.objs | 2 +- > hw/ppc/Kconfig | 1 + > hw/sparc/Kconfig | 1 + > hw/sparc64/Kconfig | 1 + > 5 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig > index e082a5610c..0d2ba531ac 100644 > --- a/hw/nvram/Kconfig > +++ b/hw/nvram/Kconfig > @@ -7,7 +7,11 @@ config AT24C > > config MAC_NVRAM > bool > + select CHRP_NVRAM > > # NMC93XX uses the NS μWire interface (similar to SPI but less configurable) > config NMC93XX_EEPROM > bool > + > +config CHRP_NVRAM > + bool > diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs > index a4bdfbf187..090df63fcd 100644 > --- a/hw/nvram/Makefile.objs > +++ b/hw/nvram/Makefile.objs > @@ -2,7 +2,7 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o > common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o > common-obj-$(CONFIG_AT24C) += eeprom_at24c.o > common-obj-y += fw_cfg.o > -common-obj-y += chrp_nvram.o > +common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o > common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o > obj-$(CONFIG_PSERIES) += spapr_nvram.o > obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o > diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig > index 8e62d8f470..e27efe9a24 100644 > --- a/hw/ppc/Kconfig > +++ b/hw/ppc/Kconfig > @@ -11,6 +11,7 @@ config PSERIES > select XIVE_SPAPR > select MSI_NONBROKEN > select FDT_PPC > + select CHRP_NVRAM > > config SPAPR_RNG > bool > diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig > index 2a83a8010e..22aff2f5b7 100644 > --- a/hw/sparc/Kconfig > +++ b/hw/sparc/Kconfig > @@ -12,6 +12,7 @@ config SUN4M > select LANCE > select M48T59 > select STP2000 > + select CHRP_NVRAM > > config LEON3 > bool > diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig > index f9f8b0f73a..980a201bb7 100644 > --- a/hw/sparc64/Kconfig > +++ b/hw/sparc64/Kconfig > @@ -12,6 +12,7 @@ config SUN4U > select IDE_CMD646 > select PCKBD > select SIMBA > + select CHRP_NVRAM > > config NIAGARA > bool
diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig index e082a5610c..0d2ba531ac 100644 --- a/hw/nvram/Kconfig +++ b/hw/nvram/Kconfig @@ -7,7 +7,11 @@ config AT24C config MAC_NVRAM bool + select CHRP_NVRAM # NMC93XX uses the NS μWire interface (similar to SPI but less configurable) config NMC93XX_EEPROM bool + +config CHRP_NVRAM + bool diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index a4bdfbf187..090df63fcd 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -2,7 +2,7 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o common-obj-$(CONFIG_AT24C) += eeprom_at24c.o common-obj-y += fw_cfg.o -common-obj-y += chrp_nvram.o +common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o obj-$(CONFIG_PSERIES) += spapr_nvram.o obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 8e62d8f470..e27efe9a24 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -11,6 +11,7 @@ config PSERIES select XIVE_SPAPR select MSI_NONBROKEN select FDT_PPC + select CHRP_NVRAM config SPAPR_RNG bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index 2a83a8010e..22aff2f5b7 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -12,6 +12,7 @@ config SUN4M select LANCE select M48T59 select STP2000 + select CHRP_NVRAM config LEON3 bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index f9f8b0f73a..980a201bb7 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -12,6 +12,7 @@ config SUN4U select IDE_CMD646 select PCKBD select SIMBA + select CHRP_NVRAM config NIAGARA bool
Only the OpenBIOS and SLOF firmwares use the CHRP NVRAM layout. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/nvram/Kconfig | 4 ++++ hw/nvram/Makefile.objs | 2 +- hw/ppc/Kconfig | 1 + hw/sparc/Kconfig | 1 + hw/sparc64/Kconfig | 1 + 5 files changed, 8 insertions(+), 1 deletion(-)