diff --git a/src/mainboard/google/skywalker/Kconfig b/src/mainboard/google/skywalker/Kconfig
index fcf37dda14..cf9c69f9b5 100644
--- a/src/mainboard/google/skywalker/Kconfig
+++ b/src/mainboard/google/skywalker/Kconfig
@@ -3,7 +3,8 @@
 # Umbrella option to be selected by variant boards.
 config BOARD_GOOGLE_SKYWALKER_COMMON
 	def_bool BOARD_GOOGLE_OBIWAN || \
-		 BOARD_GOOGLE_SKYWALKER
+		 BOARD_GOOGLE_SKYWALKER || \
+		 BOARD_GOOGLE_YODA
 
 if BOARD_GOOGLE_SKYWALKER_COMMON
 
@@ -29,6 +30,7 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Obiwan" if BOARD_GOOGLE_OBIWAN
 	default "Skywalker" if BOARD_GOOGLE_SKYWALKER
+	default "Yoda" if BOARD_GOOGLE_YODA
 
 config BOOT_DEVICE_SPI_FLASH_BUS
 	int
diff --git a/src/mainboard/google/skywalker/Kconfig.name b/src/mainboard/google/skywalker/Kconfig.name
index eb0e7c0c9e..1bef303a12 100644
--- a/src/mainboard/google/skywalker/Kconfig.name
+++ b/src/mainboard/google/skywalker/Kconfig.name
@@ -7,3 +7,6 @@ config BOARD_GOOGLE_OBIWAN
 
 config BOARD_GOOGLE_SKYWALKER
 	bool "->  Skywalker"
+
+config BOARD_GOOGLE_YODA
+	bool "-> Yoda"