6 files changed, 35 insertions, 41 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 1b9edf04b9ce..8728e4e9f5f7 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -21,7 +21,6 @@ config VBOOT
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS
-	select VBOOT_NO_BOARD_SUPPORT
 	select GBB_FLAG_DISABLE_LID_SHUTDOWN
 	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
 	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
index cac74ee435f9..7bd1c0212149 100644
--- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc
+++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
@@ -1,10 +1,10 @@
-romstage-y += fw_cfg.c
 romstage-y += memmap.c
 
-postcar-y += fw_cfg.c
 postcar-y += memmap.c
 postcar-y += exit_car.S
 
-ramstage-y += fw_cfg.c
 ramstage-y += memmap.c
 ramstage-y += northbridge.c
+
+all-y += fw_cfg.c
+all-y += bootmode.c
diff --git a/src/mainboard/emulation/qemu-i440fx/bootmode.c b/src/mainboard/emulation/qemu-i440fx/bootmode.c
new file mode 100644
index 000000000000..12990b2552ac
--- /dev/null
+++ b/src/mainboard/emulation/qemu-i440fx/bootmode.c
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <bootmode.h>
+#include <console/console.h>
+#include "fw_cfg.h"
+
+/*
+ * Enable recovery mode with fw_cfg option to qemu:
+ *   -fw_cfg name=opt/cros/recovery,string=1
+ */
+int get_recovery_mode_switch(void)
+{
+	FWCfgFile f;
+
+	if (!fw_cfg_check_file(&f, "opt/cros/recovery")) {
+		uint8_t rec_mode;
+		if (f.size != 1) {
+			printk(BIOS_ERR, "opt/cros/recovery invalid size %d\n", f.size);
+			return 0;
+		}
+		fw_cfg_get(f.select, &rec_mode, f.size);
+		if (rec_mode == '1') {
+			printk(BIOS_INFO, "Recovery is enabled.\n");
+			return 1;
+		}
+	}
+
+	return 0;
+}
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 04dce28261d7..e078aa977087 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -21,7 +21,6 @@ config VBOOT
 	select VBOOT_MUST_REQUEST_DISPLAY
 	select VBOOT_STARTS_IN_BOOTBLOCK
 	select VBOOT_VBNV_CMOS
-	select VBOOT_NO_BOARD_SUPPORT if !CHROMEOS
 	select GBB_FLAG_DISABLE_LID_SHUTDOWN
 	select GBB_FLAG_DISABLE_PD_SOFTWARE_SYNC
 	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc
index 6d5c29e7fd84..dc4e79436882 100644
--- a/src/mainboard/emulation/qemu-q35/Makefile.inc
+++ b/src/mainboard/emulation/qemu-q35/Makefile.inc
@@ -1,23 +1,21 @@
 bootblock-y += bootblock.c
 bootblock-y += memmap.c
 
-romstage-y += ../qemu-i440fx/fw_cfg.c
 romstage-y += ../qemu-i440fx/memmap.c
 romstage-y += memmap.c
 
-postcar-y += ../qemu-i440fx/fw_cfg.c
 postcar-y += ../qemu-i440fx/memmap.c
 postcar-y += ../qemu-i440fx/exit_car.S
 postcar-y += memmap.c
 
-ramstage-y += ../qemu-i440fx/fw_cfg.c
 ramstage-y += ../qemu-i440fx/memmap.c
 ramstage-y += ../qemu-i440fx/northbridge.c
 ramstage-y += memmap.c
 ramstage-y += cpu.c
 
-verstage-$(CONFIG_CHROMEOS) += chromeos.c
-verstage-$(CONFIG_CHROMEOS) += ../qemu-i440fx/fw_cfg.c
+all-y += ../qemu-i440fx/fw_cfg.c
+all-y += ../qemu-i440fx/bootmode.c
+
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
 
 smm-y += smi.c
diff --git a/src/mainboard/emulation/qemu-q35/chromeos.c b/src/mainboard/emulation/qemu-q35/chromeos.c
index 630874c8e8e7..bb0ffeea9577 100644
--- a/src/mainboard/emulation/qemu-q35/chromeos.c
+++ b/src/mainboard/emulation/qemu-q35/chromeos.c
@@ -2,9 +2,7 @@
 
 #include <bootmode.h>
 #include <boot/coreboot_tables.h>
-#include <console/console.h>
 #include <vendorcode/google/chromeos/chromeos.h>
-#include "../qemu-i440fx/fw_cfg.h"
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
@@ -17,35 +15,6 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
 
-int get_write_protect_state(void)
-{
-	return 0;
-}
-
-/*
- * Enable recovery mode with fw_cfg option to qemu:
- *   -fw_cfg name=opt/cros/recovery,string=1
- */
-int get_recovery_mode_switch(void)
-{
-	FWCfgFile f;
-
-	if (!fw_cfg_check_file(&f, "opt/cros/recovery")) {
-		uint8_t rec_mode;
-		if (f.size != 1) {
-			printk(BIOS_ERR, "opt/cros/recovery invalid size %d\n", f.size);
-			return 0;
-		}
-		fw_cfg_get(f.select, &rec_mode, f.size);
-		if (rec_mode == '1') {
-			printk(BIOS_INFO, "Recovery is enabled.\n");
-			return 1;
-		}
-	}
-
-	return 0;
-}
-
 static const struct cros_gpio cros_gpios[] = {
 	CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, "QEMU"),
 };