[coreboot-gerrit] Change in coreboot[master]: emulation/qemu-i440fx,q35: Split chromeos.c

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58946 )

Change subject: emulation/qemu-i440fx,q35: Split chromeos.c
......................................................................

emulation/qemu-i440fx,q35: Split chromeos.c

This drops VBOOT_NO_BOARD_SUPPORT.

There is little impact of always having recovery_mode_switch()
implemented in bootmode.c. A weak write_protect_state() is not
necessary as there is no BOOT_DEVICE_SPI_FLASH with the emulation.
Call to fill_lb_gpios() is already guarded with CONFIG(CHROMEOS)
so the weak implementation would not be referenced.

Change-Id: I3c00b30c5233ae3556b7622f97c3166668c8ab12
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/emulation/qemu-i440fx/Kconfig
M src/mainboard/emulation/qemu-i440fx/Makefile.inc
A src/mainboard/emulation/qemu-i440fx/bootmode.c
M src/mainboard/emulation/qemu-q35/Kconfig
M src/mainboard/emulation/qemu-q35/Makefile.inc
M src/mainboard/emulation/qemu-q35/chromeos.c
6 files changed, 36 insertions(+), 35 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/46/58946/1

diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 1b9edf0..8728e4e 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -21,7 +21,6 @@
    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 cac74ee..ba03e1a 100644
--- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc
+++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
@@ -8,3 +8,6 @@
 ramstage-y += fw_cfg.c
 ramstage-y += memmap.c
 ramstage-y += northbridge.c
+
+verstage-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 0000000..d6a9ffd
--- /dev/null
+++ b/src/mainboard/emulation/qemu-i440fx/bootmode.c
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <bootmode.h>
+#include <console/console.h>
+#include "../qemu-i440fx/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 04dce28..e078aa9 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -21,7 +21,6 @@
    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 6d5c29e..43dec4e 100644
--- a/src/mainboard/emulation/qemu-q35/Makefile.inc
+++ b/src/mainboard/emulation/qemu-q35/Makefile.inc
@@ -16,9 +16,10 @@
 ramstage-y += memmap.c
 ramstage-y += cpu.c

-verstage-$(CONFIG_CHROMEOS) += chromeos.c
-verstage-$(CONFIG_CHROMEOS) += ../qemu-i440fx/fw_cfg.c
+verstage-y += ../qemu-i440fx/fw_cfg.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c

+all-y += ../qemu-i440fx/bootmode.c
+
 smm-y += smi.c
 smm-y += memmap.c
diff --git a/src/mainboard/emulation/qemu-q35/chromeos.c b/src/mainboard/emulation/qemu-q35/chromeos.c
index 201e1af..0c91ef3 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 @@
    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"),
 };