hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF

Only the OpenBIOS and SLOF firmwares use the CHRP NVRAM layout.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191231183216.6781-14-philmd@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig
index 24b0ce6a2d7869f3d0e34986a26e3ac96d0e163a..e872fcb194194c1ad6eea7f7e3c3ee30fad3afc7 100644 (file)
--- 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 uWire 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 a4bdfbf187927d8bd9992b25f2399e619789b2ce..090df63fcd30f014eef87d95d679df155447eec3 100644 (file)
--- 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 8e62d8f470992ca89a58506897e74e97112c749f..e27efe9a24593da9c2c3d2a7ffc73c1fd9d9329e 100644 (file)
--- 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 2a83a8010eb773da8a32f3019a126774e62520fe..22aff2f5b766cd062fa8988c1e05ec41e5dadc2f 100644 (file)
--- 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 f9f8b0f73a8ba9da7d83c482a61f61de7b080469..980a201bb73e3ddc45b391388a29ff28688b5276 100644 (file)
--- 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