From d9c6862809ca95712e18b967a1fefc24cb607a06 Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@google.com>
Date: Thu, 2 Jul 2020 18:43:55 -0700
Subject: mb/google/zork: Drop check for ENV_RAMSTAGE in mainboard_ec_init

This change drops the check for ENV_RAMSTAGE in mainboard_ec_init()
since it is included only in ramstage. Also, the content of
ramstage_ec_init() is moved into mainboard_ec_init().

Change-Id: I282fb07a80f4de6064a544f6dd58e8f973a597b9
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43118
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/zork/ec.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/mainboard/google/zork/ec.c')

diff --git a/src/mainboard/google/zork/ec.c b/src/mainboard/google/zork/ec.c
index 4c4329dd071c..d770d2704057 100644
--- a/src/mainboard/google/zork/ec.c
+++ b/src/mainboard/google/zork/ec.c
@@ -3,10 +3,9 @@
 #include <acpi/acpi.h>
 #include <console/console.h>
 #include <ec/google/chromeec/ec.h>
-#include <soc/southbridge.h>
 #include <variant/ec.h>
 
-static void ramstage_ec_init(void)
+void mainboard_ec_init(void)
 {
 	const struct google_chromeec_event_info info = {
 		.log_events = MAINBOARD_EC_LOG_EVENTS,
@@ -19,9 +18,3 @@ static void ramstage_ec_init(void)
 
 	google_chromeec_events_init(&info, acpi_is_wakeup_s3());
 }
-
-void mainboard_ec_init(void)
-{
-	if (ENV_RAMSTAGE)
-		ramstage_ec_init();
-}
-- 
cgit v1.2.3