diff --git a/src/mainboard/google/fatcat/Kconfig b/src/mainboard/google/fatcat/Kconfig
index f822424e82..d599e8228f 100644
--- a/src/mainboard/google/fatcat/Kconfig
+++ b/src/mainboard/google/fatcat/Kconfig
@@ -64,6 +64,14 @@ config BOARD_GOOGLE_MODEL_FATCAT
 	select DRIVERS_INTEL_TOUCH
 	select FSP_UGOP_EARLY_SIGN_OF_LIFE
 
+config BOARD_GOOGLE_MODEL_FELINO
+	def_bool n
+	select BOARD_GOOGLE_BASEBOARD_FATCAT
+	select FSP_UGOP_EARLY_SIGN_OF_LIFE
+	select HAVE_SLP_S0_GATE
+	select DRIVERS_SOUNDWIRE_ALC1320
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
+
 config BOARD_GOOGLE_FATCAT
 	select BOARD_GOOGLE_MODEL_FATCAT
 	select EC_GOOGLE_CHROMEEC_MEC
@@ -81,11 +89,7 @@ config BOARD_GOOGLE_FATCATITE
 	select BOARD_GOOGLE_MODEL_FATCAT
 
 config BOARD_GOOGLE_FELINO
-	select BOARD_GOOGLE_BASEBOARD_FATCAT
-	select FSP_UGOP_EARLY_SIGN_OF_LIFE
-	select HAVE_SLP_S0_GATE
-	select DRIVERS_SOUNDWIRE_ALC1320
-	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
+	select BOARD_GOOGLE_MODEL_FELINO
 
 config BOARD_GOOGLE_FRANCKA
 	select BOARD_GOOGLE_BASEBOARD_FATCAT
@@ -130,7 +134,7 @@ config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x03 if BOARD_GOOGLE_MODEL_FATCAT
 	default 0x01 if BOARD_GOOGLE_FRANCKA
-	default 0x01 if BOARD_GOOGLE_FELINO
+	default 0x01 if BOARD_GOOGLE_MODEL_FELINO
 	default 0x03 if BOARD_GOOGLE_KINMEN
 
 config HAVE_SLP_S0_GATE
@@ -160,7 +164,7 @@ config MEMORY_SOLDERDOWN
 config TPM_TIS_ACPI_INTERRUPT
 	int
 	default 47 if BOARD_GOOGLE_MODEL_FATCAT # GPE0_DW1_15 (GPP_D15)
-	default 79 if BOARD_GOOGLE_FELINO # GPE0_DW2_15 (GPP_F15)
+	default 79 if BOARD_GOOGLE_MODEL_FELINO # GPE0_DW2_15 (GPP_F15)
 	default 11 if BOARD_GOOGLE_FRANCKA # GPE0_DW0_11 (GPP_H11)
 	default 66 if BOARD_GOOGLE_KINMEN # GPE0_DW2_02 (GPP_E02)
 
@@ -176,7 +180,7 @@ config VARIANT_DIR
 	string
 	default "fatcat" if BOARD_GOOGLE_MODEL_FATCAT
 	default "francka" if BOARD_GOOGLE_FRANCKA
-	default "felino" if BOARD_GOOGLE_FELINO
+	default "felino" if BOARD_GOOGLE_MODEL_FELINO
 	default "kinmen" if BOARD_GOOGLE_KINMEN
 
 config OVERRIDE_DEVICETREE