diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-12 08:02:35 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-13 13:19:53 +0000 |
| commit | 09e2f6e1ba10b5d75385541266117f2e6b6b975b (patch) | |
| tree | fac0125a4207ab170e0ef11beab502ef8d638e4e | |
| parent | d1c1c9a76e929ea61c023adbcbb550d077d08e01 (diff) | |
intel/fsp_rangeley: Avoid preprocessor with HAVE_SMI_HANDLER
Change-Id: Id9abc239a92fa7d3e29738f08f2ccdaf3232dfb6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34253
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | src/southbridge/intel/fsp_rangeley/acpi.c | 3 | ||||
| -rw-r--r-- | 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 e0b3cb985c..aeb2d9b3bb 100644 --- a/src/southbridge/intel/fsp_rangeley/acpi.c +++ b/src/southbridge/intel/fsp_rangeley/acpi.c @@ -23,9 +23,6 @@ #include <device/pci_ops.h> #include <version.h> -#if CONFIG(HAVE_SMI_HANDLER) -#include <cpu/x86/smm.h> -#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 ba5e04bd3c..af2e411584 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("\\"); |