herobrine: Move hibernate config to the board level

Move the config of hibernate wake source and hook from the baseboard
level to the board level. The new Herobrine hardware will use different
wake sources and have different hook.

BRANCH=None
BUG=b:192253134
TEST=Built the herobrine_npcx7 EC-OS and Zephyr images successfully.

Change-Id: Idbad8f985252fdef0657427d5f8d5883029a641f
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2993211
Reviewed-by: Keith Short <keithshort@chromium.org>

6 files changed, 15 insertions, 24 deletions

diff --git a/baseboard/herobrine/baseboard.c b/baseboard/herobrine/baseboard.c
index e1eef9c374..3103aaf4c5 100644
--- a/baseboard/herobrine/baseboard.c
+++ b/baseboard/herobrine/baseboard.c
@@ -7,15 +7,6 @@
 
 #include "i2c.h"
 
-/* Wake-up pins for hibernate */
-const enum gpio_signal hibernate_wake_pins[] = {
-	GPIO_LID_OPEN,
-	GPIO_AC_PRESENT,
-	GPIO_POWER_BUTTON_L,
-	GPIO_EC_RST_ODL,
-};
-const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins);
-
 int board_allow_i2c_passthru(int port)
 {
 	return (port == I2C_PORT_VIRTUAL_BATTERY);
diff --git a/baseboard/herobrine/build.mk b/baseboard/herobrine/build.mk
index f4d2b5edb6..f007fd7118 100644
--- a/baseboard/herobrine/build.mk
+++ b/baseboard/herobrine/build.mk
@@ -7,6 +7,5 @@
 #
 
 baseboard-y+=baseboard.o
-baseboard-y+=hibernate.o
 baseboard-y+=usbc_config.o
 baseboard-y+=usb_pd_policy.o
diff --git a/baseboard/herobrine/hibernate.c b/baseboard/herobrine/hibernate.c
deleted file mode 100644
index c28082e75d..0000000000
--- a/baseboard/herobrine/hibernate.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright 2021 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gpio.h"
-#include "system.h"
-
-void board_hibernate_late(void)
-{
-	/* Set the hibernate GPIO to turn off the rails */
-	gpio_set_level(GPIO_HIBERNATE_L, 0);
-}
diff --git a/board/herobrine_npcx7/board.c b/board/herobrine_npcx7/board.c
index 19fe8e0226..2ad97b43a5 100644
--- a/board/herobrine_npcx7/board.c
+++ b/board/herobrine_npcx7/board.c
@@ -31,6 +31,15 @@
 
 #include "gpio_list.h"
 
+/* Wake-up pins for hibernate */
+const enum gpio_signal hibernate_wake_pins[] = {
+	GPIO_LID_OPEN,
+	GPIO_AC_PRESENT,
+	GPIO_POWER_BUTTON_L,
+	GPIO_EC_RST_ODL,
+};
+const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins);
+
 /* Keyboard scan setting */
 struct keyboard_scan_config keyscan_config = {
 	/* Use 80 us, because KSO_02 passes through the H1. */
diff --git a/board/herobrine_npcx7/hibernate.c b/board/herobrine_npcx7/hibernate.c
index 504a295463..f6ebf462aa 100644
--- a/board/herobrine_npcx7/hibernate.c
+++ b/board/herobrine_npcx7/hibernate.c
@@ -5,6 +5,12 @@
 
 #include "gpio.h"
 
+void board_hibernate_late(void)
+{
+	/* Set the hibernate GPIO to turn off the rails */
+	gpio_set_level(GPIO_HIBERNATE_L, 0);
+}
+
 void board_hibernate(void)
 {
 	/*
diff --git a/zephyr/projects/trogdor/herobrine_npcx7/CMakeLists.txt b/zephyr/projects/trogdor/herobrine_npcx7/CMakeLists.txt
index e9abf345a1..b4b11127f4 100644
--- a/zephyr/projects/trogdor/herobrine_npcx7/CMakeLists.txt
+++ b/zephyr/projects/trogdor/herobrine_npcx7/CMakeLists.txt
@@ -17,7 +17,6 @@ set(PLATFORM_EC_BOARD "${PLATFORM_EC}/board/herobrine_npcx7" CACHE PATH
   "Path to the platform/ec board directory")
 
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_USBC
-  "${PLATFORM_EC_BASEBOARD}/hibernate.c"
   "${PLATFORM_EC_BASEBOARD}/usbc_config.c"
   "${PLATFORM_EC_BASEBOARD}/usb_pd_policy.c")