Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38484 )
Change subject: src/mainboard/protectli/vault_kbl: fix building for coreboot master ......................................................................
src/mainboard/protectli/vault_kbl: fix building for coreboot master
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I27742729054a38cbad3fca6e1dcf29bff94f0a63 --- M src/mainboard/protectli/vault_kbl/Makefile.inc M src/mainboard/protectli/vault_kbl/dsdt.asl M src/mainboard/protectli/vault_kbl/smihandler.c 3 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/38484/1
diff --git a/src/mainboard/protectli/vault_kbl/Makefile.inc b/src/mainboard/protectli/vault_kbl/Makefile.inc index 81d3ce2..2eaddec 100644 --- a/src/mainboard/protectli/vault_kbl/Makefile.inc +++ b/src/mainboard/protectli/vault_kbl/Makefile.inc @@ -21,3 +21,12 @@ ramstage-y += hda_verb.c
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c + +cbfs-files-y += boot_guard_acm.bin +boot_guard_acm.bin-file := kbl_btg_acm.bin +boot_guard_acm.bin-type := raw +boot_guard_acm.bin-position := 0xfffe0000 + +INTERMEDIATE+=add_btg_acm_fit +add_btg_acm_fit: $(obj)/coreboot.pre $(IFITTOOL) + $(IFITTOOL) -r COREBOOT -a -n boot_guard_acm.bin -t 2 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) -f $< diff --git a/src/mainboard/protectli/vault_kbl/dsdt.asl b/src/mainboard/protectli/vault_kbl/dsdt.asl index ac929a6..86ea299 100644 --- a/src/mainboard/protectli/vault_kbl/dsdt.asl +++ b/src/mainboard/protectli/vault_kbl/dsdt.asl @@ -43,7 +43,7 @@ }
// Chipset specific sleep states - #include <soc/intel/skylake/acpi/sleepstates.asl> + #include <southbridge/intel/common/acpi/sleepstates.asl>
// Mainboard specific #include "acpi/mainboard.asl" diff --git a/src/mainboard/protectli/vault_kbl/smihandler.c b/src/mainboard/protectli/vault_kbl/smihandler.c index d2df31d..e8d2d22 100644 --- a/src/mainboard/protectli/vault_kbl/smihandler.c +++ b/src/mainboard/protectli/vault_kbl/smihandler.c @@ -19,7 +19,7 @@ #include <soc/iomap.h> #include <soc/nvs.h> #include <soc/pm.h> -#include <soc/smm.h> +#include <intelblocks/smihandler.h>
int mainboard_io_trap_handler(int smif) {