summaryrefslogtreecommitdiff
path: root/src/soc/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/soc/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/soc/intel')
-rw-r--r--src/soc/intel/baytrail/include/soc/nvs.h3
-rw-r--r--src/soc/intel/braswell/include/soc/nvs.h2
-rw-r--r--src/soc/intel/broadwell/include/soc/nvs.h3
-rw-r--r--src/soc/intel/broadwell/include/soc/xhci.h2
-rw-r--r--src/soc/intel/denverton_ns/include/soc/nvs.h2
-rw-r--r--src/soc/intel/fsp_baytrail/include/soc/nvs.h3
6 files changed, 3 insertions, 12 deletions
diff --git a/src/soc/intel/baytrail/include/soc/nvs.h b/src/soc/intel/baytrail/include/soc/nvs.h
index 08ccbf44ff..4a89eb967e 100644
--- a/src/soc/intel/baytrail/include/soc/nvs.h
+++ b/src/soc/intel/baytrail/include/soc/nvs.h
@@ -104,9 +104,8 @@ typedef struct global_nvs_t {
check_member(global_nvs_t, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
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
#endif /* _BAYTRAIL_NVS_H_ */
diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h
index d2dc70659e..33800ef8fd 100644
--- a/src/soc/intel/braswell/include/soc/nvs.h
+++ b/src/soc/intel/braswell/include/soc/nvs.h
@@ -107,9 +107,7 @@ typedef struct global_nvs_t {
check_member(global_nvs_t, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
void acpi_create_gnvs(global_nvs_t *gnvs);
-#if ENV_SMM
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
-#endif
#endif /* _SOC_NVS_H_ */
diff --git a/src/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h
index 63c7bde23b..456fda6fa6 100644
--- a/src/soc/intel/broadwell/include/soc/nvs.h
+++ b/src/soc/intel/broadwell/include/soc/nvs.h
@@ -96,9 +96,8 @@ typedef struct global_nvs_t {
check_member(global_nvs_t, chromeos, GNVS_CHROMEOS_ACPI_OFFSET);
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
#endif
diff --git a/src/soc/intel/broadwell/include/soc/xhci.h b/src/soc/intel/broadwell/include/soc/xhci.h
index 33e4c2dd06..87a59345da 100644
--- a/src/soc/intel/broadwell/include/soc/xhci.h
+++ b/src/soc/intel/broadwell/include/soc/xhci.h
@@ -50,8 +50,6 @@
#define XHCI_PLSR_POLLING (7 << 5) /* Port is polling */
#define XHCI_PLSW_ENABLE (5 << 5) /* Transition from disabled */
-#ifdef __SMM__
void usb_xhci_sleep_prepare(pci_devfn_t dev, u8 slp_typ);
-#endif
#endif
diff --git a/src/soc/intel/denverton_ns/include/soc/nvs.h b/src/soc/intel/denverton_ns/include/soc/nvs.h
index 5a94b24bb6..8d1bc6a703 100644
--- a/src/soc/intel/denverton_ns/include/soc/nvs.h
+++ b/src/soc/intel/denverton_ns/include/soc/nvs.h
@@ -65,9 +65,7 @@ typedef struct global_nvs_t {
} __packed global_nvs_t;
-#ifdef __SMM__
/* Used in SMM to find the ACPI GNVS address */
global_nvs_t *smm_get_gnvs(void);
-#endif
#endif /* _DENVERTON_NS_NVS_H_ */
diff --git a/src/soc/intel/fsp_baytrail/include/soc/nvs.h b/src/soc/intel/fsp_baytrail/include/soc/nvs.h
index d42763a5ac..df2fc60d71 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/nvs.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/nvs.h
@@ -65,9 +65,8 @@ 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
#endif /* _BAYTRAIL_NVS_H_ */