summaryrefslogtreecommitdiff
path: root/src/southbridge/intel
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-05 19:06:56 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-08 07:46:23 +0000
commit82c0e7e3d50cca20ed98d650d511071329e9f3a0 (patch)
tree03739fcddc4d8e50488925fa0dee337cb9bc255c /src/southbridge/intel
parent44f1af2996c3727a3675a3dd3b7f199219e7fbf6 (diff)
downloadcoreboot-82c0e7e3d50cca20ed98d650d511071329e9f3a0.tar.xz
arch/x86: Drop some __SMM__ guards
Change-Id: I64063bbae5b44f1f24566609a7f770c6d5f69fac Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36637 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/southbridge/intel')
-rw-r--r--src/southbridge/intel/bd82x6x/nvs.h2
-rw-r--r--src/southbridge/intel/fsp_rangeley/nvs.h3
-rw-r--r--src/southbridge/intel/ibexpeak/nvs.h3
-rw-r--r--src/southbridge/intel/lynxpoint/nvs.h2
4 files changed, 2 insertions, 8 deletions
diff --git a/src/southbridge/intel/bd82x6x/nvs.h b/src/southbridge/intel/bd82x6x/nvs.h
index 655851105e..a6b0bdbc55 100644
--- a/src/southbridge/intel/bd82x6x/nvs.h
+++ b/src/southbridge/intel/bd82x6x/nvs.h
@@ -155,8 +155,6 @@ typedef struct global_nvs_t {
} __packed global_nvs_t;
check_member(global_nvs_t, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
-#ifdef __SMM__
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
-#endif
void acpi_create_gnvs(global_nvs_t *gnvs);
diff --git a/src/southbridge/intel/fsp_rangeley/nvs.h b/src/southbridge/intel/fsp_rangeley/nvs.h
index 12de76999d..47fca685ce 100644
--- a/src/southbridge/intel/fsp_rangeley/nvs.h
+++ b/src/southbridge/intel/fsp_rangeley/nvs.h
@@ -146,7 +146,6 @@ typedef struct {
} __packed global_nvs_t;
void acpi_create_gnvs(global_nvs_t *gnvs);
-#ifdef __SMM__
+
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
-#endif
diff --git a/src/southbridge/intel/ibexpeak/nvs.h b/src/southbridge/intel/ibexpeak/nvs.h
index 36db12c043..a95639894f 100644
--- a/src/southbridge/intel/ibexpeak/nvs.h
+++ b/src/southbridge/intel/ibexpeak/nvs.h
@@ -153,8 +153,7 @@ typedef struct global_nvs_t {
} __packed global_nvs_t;
check_member(global_nvs_t, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
-#ifdef __SMM__
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
-#endif
+
void acpi_create_gnvs(global_nvs_t *gnvs);
diff --git a/src/southbridge/intel/lynxpoint/nvs.h b/src/southbridge/intel/lynxpoint/nvs.h
index a8f0dea83c..3aca7bbda3 100644
--- a/src/southbridge/intel/lynxpoint/nvs.h
+++ b/src/southbridge/intel/lynxpoint/nvs.h
@@ -130,9 +130,7 @@ typedef struct global_nvs_t {
} __packed global_nvs_t;
check_member(global_nvs_t, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
-#ifdef __SMM__
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
-#endif
void acpi_create_gnvs(global_nvs_t * gnvs);