diff --git a/src/mainboard/google/skywalker/Kconfig b/src/mainboard/google/skywalker/Kconfig
index b3da5482b2..fcf37dda14 100644
--- a/src/mainboard/google/skywalker/Kconfig
+++ b/src/mainboard/google/skywalker/Kconfig
@@ -2,7 +2,8 @@
 
 # Umbrella option to be selected by variant boards.
 config BOARD_GOOGLE_SKYWALKER_COMMON
-	def_bool BOARD_GOOGLE_SKYWALKER
+	def_bool BOARD_GOOGLE_OBIWAN || \
+		 BOARD_GOOGLE_SKYWALKER
 
 if BOARD_GOOGLE_SKYWALKER_COMMON
 
@@ -26,6 +27,7 @@ config MAINBOARD_DIR
 
 config MAINBOARD_PART_NUMBER
 	string
+	default "Obiwan" if BOARD_GOOGLE_OBIWAN
 	default "Skywalker" if BOARD_GOOGLE_SKYWALKER
 
 config BOOT_DEVICE_SPI_FLASH_BUS
diff --git a/src/mainboard/google/skywalker/Kconfig.name b/src/mainboard/google/skywalker/Kconfig.name
index 0fc672d2db..eb0e7c0c9e 100644
--- a/src/mainboard/google/skywalker/Kconfig.name
+++ b/src/mainboard/google/skywalker/Kconfig.name
@@ -2,5 +2,8 @@
 
 comment "Skywalker"
 
+config BOARD_GOOGLE_OBIWAN
+	bool "->  Obiwan"
+
 config BOARD_GOOGLE_SKYWALKER
 	bool "->  Skywalker"