mb/*: Fix default fmap with VBOOT_SLOTS_RW_A enabled
Don't select the VBOOT fmap as default if VBOOT is disabled.
Fixes a regression introduced by f8251b98
"mb/emulation/qemu: Add VBOOT support" where the default Kconfig settings
wouldn't allow the qemu boards to run.
Also fix the Supermicro x11-lga1151 series boards.
Change-Id: I90414e2cc7e4c4a6ad67014bd4a7f9c8ff4da389
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36707
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
b7e8505d96
commit
9764bc126e
|
@ -25,9 +25,13 @@ config VBOOT
|
||||||
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
|
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
|
||||||
select GBB_FLAG_DISABLE_FWMP
|
select GBB_FLAG_DISABLE_FWMP
|
||||||
|
|
||||||
|
if VBOOT
|
||||||
|
|
||||||
config VBOOT_SLOTS_RW_A
|
config VBOOT_SLOTS_RW_A
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
config FMDFILE
|
config FMDFILE
|
||||||
string
|
string
|
||||||
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
|
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
|
||||||
|
|
|
@ -28,9 +28,13 @@ config FMDFILE
|
||||||
string
|
string
|
||||||
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
|
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rwa-16M.fmd" if VBOOT_SLOTS_RW_A
|
||||||
|
|
||||||
|
if VBOOT
|
||||||
|
|
||||||
config VBOOT_SLOTS_RW_A
|
config VBOOT_SLOTS_RW_A
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
config VBOOT_VBNV_OFFSET
|
config VBOOT_VBNV_OFFSET
|
||||||
hex
|
hex
|
||||||
default 0x2c
|
default 0x2c
|
||||||
|
|
|
@ -47,9 +47,13 @@ config VBOOT
|
||||||
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
|
select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
|
||||||
select GBB_FLAG_DISABLE_FWMP
|
select GBB_FLAG_DISABLE_FWMP
|
||||||
|
|
||||||
|
if VBOOT
|
||||||
|
|
||||||
config VBOOT_SLOTS_RW_AB
|
config VBOOT_SLOTS_RW_AB
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
endif
|
||||||
|
|
||||||
config VBOOT_VBNV_OFFSET
|
config VBOOT_VBNV_OFFSET
|
||||||
hex
|
hex
|
||||||
default 0x2a
|
default 0x2a
|
||||||
|
|
Loading…
Reference in New Issue