diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 5c232303b5..a218cc38d7 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -8,14 +8,7 @@
 #include <types.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 
-/* The WP status pin lives on MF_ISH_GPIO_4 */
-#define WP_STATUS_PAD_CFG0	0x4838
-#define WP_STATUS_PAD_CFG1	0x483C
-
-#define WP_GPIO			GP_E_22
-
-#define ACTIVE_LOW	0
-#define ACTIVE_HIGH	1
+#include "onboard.h"
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
@@ -29,30 +22,7 @@ void fill_lb_gpios(struct lb_gpios *gpios)
 
 int get_write_protect_state(void)
 {
-	/*
-	 * The vboot loader queries this function in romstage. The GPIOs have
-	 * not been set up yet as that configuration is done in ramstage.
-	 * Configuring this GPIO as input so that there isn't any ambiguity
-	 * in the reading.
-	 */
-#if ENV_ROMSTAGE
-	if (CONFIG(BOARD_GOOGLE_CYAN)) {
-		write32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG0),
-			(PAD_PULL_UP_20K | PAD_GPIO_ENABLE | PAD_CONFIG0_GPI_DEFAULT));
-		write32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG1),
-			PAD_CONFIG1_DEFAULT0);
-	} else {
-		gpio_input_pullup(WP_GPIO);
-	}
-#endif
-
-	/* WP is enabled when the pin is reading high. */
-	if (CONFIG(BOARD_GOOGLE_CYAN)) {
-		return (read32((void *)(COMMUNITY_GPEAST_BASE + WP_STATUS_PAD_CFG0))
-			& PAD_VAL_HIGH);
-	} else {
-		return !!gpio_get(WP_GPIO);
-	}
+	return !!gpio_get(WP_GPIO);
 }
 
 static const struct cros_gpio cros_gpios[] = {
diff --git a/src/mainboard/google/cyan/onboard.h b/src/mainboard/google/cyan/onboard.h
new file mode 100644
index 0000000000..dd33a38123
--- /dev/null
+++ b/src/mainboard/google/cyan/onboard.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef CYAN_ONBOARD_H
+#define CYAN_ONBOARD_H
+
+/* Write protect active high. */
+#define WP_GPIO			GP_E_22
+
+#endif