[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/38] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using Ope
From: |
Paolo Bonzini |
Subject: |
[PULL 19/38] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF |
Date: |
Wed, 8 Jan 2020 13:32:36 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Only the OpenBIOS and SLOF firmwares use the CHRP NVRAM layout.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 24b0ce6..e872fcb 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 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 a4bdfbf..090df63 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 8e62d8f..e27efe9 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 2a83a80..22aff2f 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 f9f8b0f..980a201 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
--
1.8.3.1
- [PULL 08/38] hw/timer/Kconfig: Intel 8254 PIT depends of ISA bus, (continued)
- [PULL 08/38] hw/timer/Kconfig: Intel 8254 PIT depends of ISA bus, Paolo Bonzini, 2020/01/08
- [PULL 09/38] hw/usb/redirect: Do not link 'usb-redir' device when USB not enabled, Paolo Bonzini, 2020/01/08
- [PULL 10/38] hw/intc/i8259: Fix Kconfig dependency on ISA bus, Paolo Bonzini, 2020/01/08
- [PULL 11/38] hw/i386/Kconfig: Let the MicroVM machine select the SERIAL_ISA config, Paolo Bonzini, 2020/01/08
- [PULL 12/38] hw/ppc/Kconfig: Restrict the MPC I2C controller to e500-based platforms, Paolo Bonzini, 2020/01/08
- [PULL 13/38] hw/ppc/Kconfig: Let the Sam460ex board use the PowerPC 405 devices, Paolo Bonzini, 2020/01/08
- [PULL 14/38] hw/ppc/Kconfig: Let the Xilinx Virtex5 ML507 use the PPC-440 devices, Paolo Bonzini, 2020/01/08
- [PULL 15/38] hw/ppc/Makefile: Simplify the sPAPR PCI objects rule, Paolo Bonzini, 2020/01/08
- [PULL 16/38] hw/ppc/Kconfig: Only select fw_cfg with machines using OpenBIOS, Paolo Bonzini, 2020/01/08
- [PULL 17/38] hw/ppc/Kconfig: Only select FDT helper for machines using it, Paolo Bonzini, 2020/01/08
- [PULL 19/38] hw/nvram/Kconfig: Restrict CHRP NVRAM to machines using OpenBIOS or SLOF,
Paolo Bonzini <=
- [PULL 18/38] hw/nvram/Kconfig: Add an entry for the NMC93xx EEPROM, Paolo Bonzini, 2020/01/08
- [PULL 20/38] hw/rtc/mc146818: Add missing dependency on ISA Bus, Paolo Bonzini, 2020/01/08
- [PULL 21/38] target/i386: Fix handling of k_gs_base register in 32-bit mode in gdbstub, Paolo Bonzini, 2020/01/08
- [PULL 22/38] target/i386: Add new bit definitions of MSR_IA32_ARCH_CAPABILITIES, Paolo Bonzini, 2020/01/08
- [PULL 23/38] target/i386: Add missed features to Cooperlake CPU model, Paolo Bonzini, 2020/01/08
- [PULL 25/38] hw/ipmi: Explicit we ignore some QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 24/38] hw/ipmi: Remove unnecessary declarations, Paolo Bonzini, 2020/01/08
- [PULL 26/38] hw/char/terminal3270: Explicit ignored QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 27/38] hw/usb/dev-serial: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08
- [PULL 28/38] hw/usb/redirect: Explicit we ignore few QEMUChrEvent in IOEventHandler, Paolo Bonzini, 2020/01/08