aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard
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/mainboard
parent44f1af2996c3727a3675a3dd3b7f199219e7fbf6 (diff)
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/mainboard')
-rw-r--r--src/mainboard/google/stout/ec.h5
-rw-r--r--src/mainboard/hp/pavilion_m6_1035dx/ec.h2
-rw-r--r--src/mainboard/lenovo/g505s/ec.h2
-rw-r--r--src/mainboard/lenovo/s230u/ec.h2
4 files changed, 1 insertions, 10 deletions
diff --git a/src/mainboard/google/stout/ec.h b/src/mainboard/google/stout/ec.h
index 8c7882f565..f035e246be 100644
--- a/src/mainboard/google/stout/ec.h
+++ b/src/mainboard/google/stout/ec.h
@@ -22,10 +22,7 @@
#define EC_SMI_LID_CLOSED 0x2B
#ifndef __ACPI__
-extern void stout_ec_init(void);
-#endif
-
-#ifdef __SMM__
+void stout_ec_init(void);
void stout_ec_finalize_smm(void);
#endif
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/ec.h b/src/mainboard/hp/pavilion_m6_1035dx/ec.h
index 40e33ee724..55672513e5 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/ec.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/ec.h
@@ -19,8 +19,6 @@
#include "mainboard.h"
-#ifndef __SMM__
void pavilion_m6_1035dx_ec_init(void);
-#endif
#endif /* _MAINBOARD_HP_PAVILION_M6_1035DX_EC_H */
diff --git a/src/mainboard/lenovo/g505s/ec.h b/src/mainboard/lenovo/g505s/ec.h
index 86fd673fa8..52a3ab71d8 100644
--- a/src/mainboard/lenovo/g505s/ec.h
+++ b/src/mainboard/lenovo/g505s/ec.h
@@ -19,8 +19,6 @@
#include "mainboard.h"
-#ifndef __SMM__
void lenovo_g505s_ec_init(void);
-#endif
#endif /* _MAINBOARD_LENOVO_G505S_EC_H */
diff --git a/src/mainboard/lenovo/s230u/ec.h b/src/mainboard/lenovo/s230u/ec.h
index 87fbc7f40e..a5bc4236ff 100644
--- a/src/mainboard/lenovo/s230u/ec.h
+++ b/src/mainboard/lenovo/s230u/ec.h
@@ -17,9 +17,7 @@
#ifndef _MAINBOARD_LENOVO_S230U_EC_H
#define _MAINBOARD_LENOVO_S230U_EC_H
-#ifndef __SMM__
void lenovo_s230u_ec_init(void);
-#endif
#define ECMM(x) (*((volatile u8 *)(CONFIG_EC_BASE_ADDRESS + x)))
#define ec_mm_read(addr) (ECMM(0x100 + addr))