diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index 9e0146413c..7032d674b8 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -1,6 +1,7 @@
 if BOARD_GOOGLE_KUKUI
 
 config VBOOT
+	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select VBOOT_MOCK_SECDATA
 
 config BOARD_SPECIFIC_OPTIONS
@@ -12,6 +13,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select SPI_FLASH
 	select FATAL_ASSERTS
 	select SPI_FLASH_INCLUDE_ALL_DRIVERS
+	select EC_GOOGLE_CHROMEEC
+	select EC_GOOGLE_CHROMEEC_SPI
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/google/kukui/chromeos.c b/src/mainboard/google/kukui/chromeos.c
index bb14b1cc70..ace99bc11e 100644
--- a/src/mainboard/google/kukui/chromeos.c
+++ b/src/mainboard/google/kukui/chromeos.c
@@ -28,17 +28,13 @@ void setup_chromeos_gpios(void)
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
 	struct lb_gpio chromeos_gpios[] = {
+		{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
 		{EC_IN_RW.id, ACTIVE_HIGH, -1, "EC in RW"},
 		{EC_IRQ.id, ACTIVE_LOW, -1, "EC interrupt"},
 	};
 	lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }
 
-int get_recovery_mode_switch(void)
-{
-	return 0;
-}
-
 int get_write_protect_state(void)
 {
 	return 0;