diff --git a/src/mainboard/google/skywalker/Kconfig b/src/mainboard/google/skywalker/Kconfig
index 49b3d21718..a868258643 100644
--- a/src/mainboard/google/skywalker/Kconfig
+++ b/src/mainboard/google/skywalker/Kconfig
@@ -3,6 +3,7 @@
 # Umbrella option to be selected by variant boards.
 config BOARD_GOOGLE_SKYWALKER_COMMON
 	def_bool BOARD_GOOGLE_ANAKIN || \
+		 BOARD_GOOGLE_BAZE || \
 		 BOARD_GOOGLE_OBIWAN || \
 		 BOARD_GOOGLE_SKYWALKER || \
 		 BOARD_GOOGLE_YODA
@@ -44,6 +45,7 @@ config MAINBOARD_DIR
 config MAINBOARD_PART_NUMBER
 	string
 	default "Anakin" if BOARD_GOOGLE_ANAKIN
+	default "Baze" if BOARD_GOOGLE_BAZE
 	default "Obiwan" if BOARD_GOOGLE_OBIWAN
 	default "Skywalker" if BOARD_GOOGLE_SKYWALKER
 	default "Yoda" if BOARD_GOOGLE_YODA
diff --git a/src/mainboard/google/skywalker/Kconfig.name b/src/mainboard/google/skywalker/Kconfig.name
index a7c8eb3088..d79033d744 100644
--- a/src/mainboard/google/skywalker/Kconfig.name
+++ b/src/mainboard/google/skywalker/Kconfig.name
@@ -5,6 +5,9 @@ comment "Skywalker"
 config BOARD_GOOGLE_ANAKIN
 	bool "->  Anakin"
 
+config BOARD_GOOGLE_BAZE
+	bool "->  Baze"
+
 config BOARD_GOOGLE_OBIWAN
 	bool "->  Obiwan"