Do this by subsuming the existing COREBOOT boolean into a choice option of COREBOOT, XEN and GENERIC.
Signed-off-by: Ian Campbell ian.campbell@citrix.com --- src/Kconfig | 17 ++++++++++++++++- src/shadow.c | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 3133d88..fd7de41 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -4,12 +4,27 @@ mainmenu "SeaBIOS Configuration"
menu "General Features"
+ choice + prompt "Select target environment" + default GENERIC + config COREBOOT bool "Build for coreboot" - default n help Configure as a coreboot payload.
+ config XEN + bool "Build for Xen HVM" + help + Configure to be used by xen hvmloader, for a HVM guest. + + config GENERIC + bool "Build for generic target environment" + help + Configure to be used in a generic target environment. + + endchoice + config THREADS bool "Parallelize hardware init" default y diff --git a/src/shadow.c b/src/shadow.c index ed530e0..a778701 100644 --- a/src/shadow.c +++ b/src/shadow.c @@ -102,7 +102,7 @@ static const struct pci_device_id dram_controller_make_writable_tbl[] = { void make_bios_writable(void) { - if (CONFIG_COREBOOT) + if (CONFIG_COREBOOT || CONFIG_XEN) return;
dprintf(3, "enabling shadow ram\n"); @@ -127,7 +127,7 @@ static const struct pci_device_id dram_controller_make_readonly_tbl[] = { void make_bios_readonly(void) { - if (CONFIG_COREBOOT) + if (CONFIG_COREBOOT || CONFIG_XEN) return;
dprintf(3, "locking shadow ram\n");