Skip to content

Commit 7bebc35

Browse files
philmdbonzini
authored andcommitted
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é <[email protected]> Message-Id: <[email protected]> Acked-by: David Gibson <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 3fd0305 commit 7bebc35

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

hw/nvram/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ config AT24C
77

88
config MAC_NVRAM
99
bool
10+
select CHRP_NVRAM
1011

1112
# NMC93XX uses the NS uWire interface (similar to SPI but less configurable)
1213
config NMC93XX_EEPROM
1314
bool
15+
16+
config CHRP_NVRAM
17+
bool

hw/nvram/Makefile.objs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o
22
common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o
33
common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
44
common-obj-y += fw_cfg.o
5-
common-obj-y += chrp_nvram.o
5+
common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o
66
common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
77
obj-$(CONFIG_PSERIES) += spapr_nvram.o
88
obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o

hw/ppc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ config PSERIES
1111
select XIVE_SPAPR
1212
select MSI_NONBROKEN
1313
select FDT_PPC
14+
select CHRP_NVRAM
1415

1516
config SPAPR_RNG
1617
bool

hw/sparc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ config SUN4M
1212
select LANCE
1313
select M48T59
1414
select STP2000
15+
select CHRP_NVRAM
1516

1617
config LEON3
1718
bool

hw/sparc64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ config SUN4U
1212
select IDE_CMD646
1313
select PCKBD
1414
select SIMBA
15+
select CHRP_NVRAM
1516

1617
config NIAGARA
1718
bool

0 commit comments

Comments
 (0)