From 09e2f6e1ba10b5d75385541266117f2e6b6b975b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 12 Jul 2019 08:02:35 +0300 Subject: intel/fsp_rangeley: Avoid preprocessor with HAVE_SMI_HANDLER MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id9abc239a92fa7d3e29738f08f2ccdaf3232dfb6 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34253 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/southbridge/intel/fsp_rangeley/acpi.c | 3 --- src/southbridge/intel/fsp_rangeley/lpc.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/southbridge/intel/fsp_rangeley/acpi.c b/src/southbridge/intel/fsp_rangeley/acpi.c index e0b3cb985c4e..aeb2d9b3bb6e 100644 --- a/src/southbridge/intel/fsp_rangeley/acpi.c +++ b/src/southbridge/intel/fsp_rangeley/acpi.c @@ -23,9 +23,6 @@ #include #include -#if CONFIG(HAVE_SMI_HANDLER) -#include -#endif /** * Fill in the FADT with generic values that can be overridden later. diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c index ba5e04bd3c11..af2e4115841f 100644 --- a/src/southbridge/intel/fsp_rangeley/lpc.c +++ b/src/southbridge/intel/fsp_rangeley/lpc.c @@ -421,10 +421,10 @@ static void southbridge_inject_dsdt(struct device *dev) if (gnvs) { memset(gnvs, 0, sizeof(*gnvs)); acpi_create_gnvs(gnvs); -#if CONFIG(HAVE_SMI_HANDLER) + /* And tell SMI about it */ - smm_setup_structures(gnvs, NULL, NULL); -#endif + if (CONFIG(HAVE_SMI_HANDLER)) + smm_setup_structures(gnvs, NULL, NULL); /* Add it to DSDT. */ acpigen_write_scope("\\"); -- cgit v1.2.3