From 4112c7791920aadab079865db4ae24790775c204 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 20 Apr 2025 17:43:21 -0500 Subject: [PATCH] mb/google/jecht: Use CFR setup menu to manage options Enable support for managing system options via CFR, and select it by default when using edk2 with SMMSTORE. TEST=build/boot guado w/edk2 payload Change-Id: I1d407a702513bcffde6b1578469b6e307e5db662 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/87563 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/google/jecht/Kconfig | 1 + src/mainboard/google/jecht/Makefile.mk | 1 + src/mainboard/google/jecht/cfr.c | 33 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/mainboard/google/jecht/cfr.c diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index eb3b985e5a..9122e8750f 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -3,6 +3,7 @@ config BOARD_GOOGLE_BASEBOARD_JECHT def_bool n select BOARD_ROMSIZE_KB_8192 + select DRIVERS_OPTION_CFR_ENABLED if PAYLOAD_EDK2 && SMMSTORE select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE diff --git a/src/mainboard/google/jecht/Makefile.mk b/src/mainboard/google/jecht/Makefile.mk index ed74d75109..43d6b2471d 100644 --- a/src/mainboard/google/jecht/Makefile.mk +++ b/src/mainboard/google/jecht/Makefile.mk @@ -16,6 +16,7 @@ bootblock-y += led.c bootblock-y += bootblock.c ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads +ramstage-$(CONFIG_DRIVERS_OPTION_CFR) += cfr.c subdirs-y += variants/$(VARIANT_DIR) CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/jecht/cfr.c b/src/mainboard/google/jecht/cfr.c new file mode 100644 index 0000000000..9f4d19088e --- /dev/null +++ b/src/mainboard/google/jecht/cfr.c @@ -0,0 +1,33 @@ + +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +static struct sm_obj_form system = { + .ui_name = "System", + .obj_list = (const struct sm_object *[]) { + &me_disable, + NULL + }, +}; + +static struct sm_obj_form power = { + .ui_name = "Power", + .obj_list = (const struct sm_object *[]) { + &power_on_after_fail, + NULL + }, +}; + +static struct sm_obj_form *sm_root[] = { + &system, + &power, + NULL +}; + +void mb_cfr_setup_menu(struct lb_cfr *cfr_root) +{ + cfr_write_setup_menu(cfr_root, sm_root); +}