Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/71802 )
Change subject: {ec,mb}/system76: Move smbios_system_wakeup_type ......................................................................
{ec,mb}/system76: Move smbios_system_wakeup_type
Move the implementation of smbios_system_wakeup_type from the mainboards to the EC for all models that use System76 EC (everything except KBL).
Change-Id: Iaace234ca87e8a05eaa006a438d2c9eb13ce4d76 Signed-off-by: Tim Crawford tcrawford@system76.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/71802 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Jeremy Soller jeremy@system76.com --- M src/ec/system76/ec/Makefile.inc A src/ec/system76/ec/smbios.c M src/mainboard/system76/addw1/ramstage.c M src/mainboard/system76/adl/ramstage.c M src/mainboard/system76/bonw14/ramstage.c M src/mainboard/system76/cml-u/ramstage.c M src/mainboard/system76/gaze15/ramstage.c M src/mainboard/system76/oryp5/ramstage.c M src/mainboard/system76/oryp6/ramstage.c M src/mainboard/system76/tgl-h/ramstage.c M src/mainboard/system76/tgl-u/ramstage.c M src/mainboard/system76/whl-u/ramstage.c 12 files changed, 28 insertions(+), 60 deletions(-)
Approvals: build bot (Jenkins): Verified Jeremy Soller: Looks good to me, approved
diff --git a/src/ec/system76/ec/Makefile.inc b/src/ec/system76/ec/Makefile.inc index 110b997..9808e29 100644 --- a/src/ec/system76/ec/Makefile.inc +++ b/src/ec/system76/ec/Makefile.inc @@ -2,6 +2,9 @@ ifeq ($(CONFIG_EC_SYSTEM76_EC),y)
all-y += system76_ec.c + +ramstage-y += smbios.c + smm-$(CONFIG_DEBUG_SMI) += system76_ec.c
endif diff --git a/src/ec/system76/ec/smbios.c b/src/ec/system76/ec/smbios.c new file mode 100644 index 0000000..e55d5f0 --- /dev/null +++ b/src/ec/system76/ec/smbios.c @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <smbios.h> + +smbios_wakeup_type smbios_system_wakeup_type(void) +{ + // TODO: Read wake source from EC. + return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; +} diff --git a/src/mainboard/system76/addw1/ramstage.c b/src/mainboard/system76/addw1/ramstage.c index 376849f..ca6f64b1 100644 --- a/src/mainboard/system76/addw1/ramstage.c +++ b/src/mainboard/system76/addw1/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <variant/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/adl/ramstage.c b/src/mainboard/system76/adl/ramstage.c index 86ce821..c767f2d 100644 --- a/src/mainboard/system76/adl/ramstage.c +++ b/src/mainboard/system76/adl/ramstage.c @@ -2,12 +2,6 @@
#include <mainboard/gpio.h> #include <soc/ramstage.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
void mainboard_silicon_init_params(FSP_S_CONFIG *params) { diff --git a/src/mainboard/system76/bonw14/ramstage.c b/src/mainboard/system76/bonw14/ramstage.c index 839b84a..43ee54f 100644 --- a/src/mainboard/system76/bonw14/ramstage.c +++ b/src/mainboard/system76/bonw14/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <mainboard/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/cml-u/ramstage.c b/src/mainboard/system76/cml-u/ramstage.c index 839b84a..43ee54f 100644 --- a/src/mainboard/system76/cml-u/ramstage.c +++ b/src/mainboard/system76/cml-u/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <mainboard/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/gaze15/ramstage.c b/src/mainboard/system76/gaze15/ramstage.c index 376849f..ca6f64b1 100644 --- a/src/mainboard/system76/gaze15/ramstage.c +++ b/src/mainboard/system76/gaze15/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <variant/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/oryp5/ramstage.c b/src/mainboard/system76/oryp5/ramstage.c index 839b84a..43ee54f 100644 --- a/src/mainboard/system76/oryp5/ramstage.c +++ b/src/mainboard/system76/oryp5/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <mainboard/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/oryp6/ramstage.c b/src/mainboard/system76/oryp6/ramstage.c index 376849f..ca6f64b1 100644 --- a/src/mainboard/system76/oryp6/ramstage.c +++ b/src/mainboard/system76/oryp6/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <variant/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/tgl-h/ramstage.c b/src/mainboard/system76/tgl-h/ramstage.c index 49b9934..480c49c 100644 --- a/src/mainboard/system76/tgl-h/ramstage.c +++ b/src/mainboard/system76/tgl-h/ramstage.c @@ -2,12 +2,6 @@
#include <soc/ramstage.h> #include <variant/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/tgl-u/ramstage.c b/src/mainboard/system76/tgl-u/ramstage.c index a01391a..a3b12bb 100644 --- a/src/mainboard/system76/tgl-u/ramstage.c +++ b/src/mainboard/system76/tgl-u/ramstage.c @@ -2,12 +2,6 @@
#include <mainboard/gpio.h> #include <soc/ramstage.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) { diff --git a/src/mainboard/system76/whl-u/ramstage.c b/src/mainboard/system76/whl-u/ramstage.c index 839b84a..43ee54f 100644 --- a/src/mainboard/system76/whl-u/ramstage.c +++ b/src/mainboard/system76/whl-u/ramstage.c @@ -2,12 +2,6 @@
#include <device/device.h> #include <mainboard/gpio.h> -#include <smbios.h> - -smbios_wakeup_type smbios_system_wakeup_type(void) -{ - return SMBIOS_WAKEUP_TYPE_POWER_SWITCH; -}
static void mainboard_init(void *chip_info) {