From 80a2e0d9b9bb5af09bfaefd193efd754ebee8953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 28 Jan 2021 13:09:38 +0200 Subject: [PATCH] soc/intel: Guard TRAP method in ASL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed to support build with ACPI_SOC_NVS=n as SMIF object inside GNVS disappears then. Change-Id: Ib798187c24996b74d6345080f7d48c3f657eb512 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/50358 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/southbridge/intel/common/acpi/platform.asl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/southbridge/intel/common/acpi/platform.asl b/src/southbridge/intel/common/acpi/platform.asl index b1dda02716..342a4eff94 100644 --- a/src/southbridge/intel/common/acpi/platform.asl +++ b/src/southbridge/intel/common/acpi/platform.asl @@ -17,6 +17,7 @@ Field (POST, ByteAcc, Lock, Preserve) DBG0, 8 } +#if CONFIG(ACPI_SOC_NVS) /* SMI I/O Trap */ Method(TRAP, 1, Serialized) { @@ -24,6 +25,7 @@ Method(TRAP, 1, Serialized) TRP0 = 0 // Generate trap Return (SMIF) // Return value of SMI handler } +#endif /* ACPI_SOC_NVS */ /* The _PIC method is called by the OS to choose between interrupt * routing via the i8259 interrupt controller or the APIC.