diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index 437fe89d5f..59f6c67872 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -3,6 +3,28 @@
 config BOARD_GOOGLE_BASEBOARD_SKYRIM
 	def_bool n
 
+config BOARD_GOOGLE_SKYRIM
+	select BOARD_GOOGLE_BASEBOARD_SKYRIM
+	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
+
+config BOARD_GOOGLE_WINTERHOLD
+	select BOARD_GOOGLE_BASEBOARD_SKYRIM
+	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
+	select FEATURE_DYNAMIC_DPTC
+
+config BOARD_GOOGLE_FROSTFLOW
+	select BOARD_GOOGLE_BASEBOARD_SKYRIM
+	select DRIVERS_GENESYSLOGIC_GL9755
+	select FEATURE_TABLET_MODE_DPTC
+	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
+
+config BOARD_GOOGLE_CRYSTALDRIFT
+	select BOARD_GOOGLE_BASEBOARD_SKYRIM
+
+config BOARD_GOOGLE_MARKARTH
+	select BOARD_GOOGLE_BASEBOARD_SKYRIM
+	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
+
 if BOARD_GOOGLE_BASEBOARD_SKYRIM
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/google/skyrim/Kconfig.name b/src/mainboard/google/skyrim/Kconfig.name
index 7e458770e5..a68ecb061b 100644
--- a/src/mainboard/google/skyrim/Kconfig.name
+++ b/src/mainboard/google/skyrim/Kconfig.name
@@ -2,27 +2,15 @@ comment "Skyrim"
 
 config BOARD_GOOGLE_SKYRIM
 	bool "->  Skyrim"
-	select BOARD_GOOGLE_BASEBOARD_SKYRIM
-	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
 
 config BOARD_GOOGLE_WINTERHOLD
 	bool "->  Winterhold"
-	select BOARD_GOOGLE_BASEBOARD_SKYRIM
-	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
-	select FEATURE_DYNAMIC_DPTC
 
 config BOARD_GOOGLE_FROSTFLOW
 	bool "->  Frostflow"
-	select BOARD_GOOGLE_BASEBOARD_SKYRIM
-	select DRIVERS_GENESYSLOGIC_GL9755
-	select FEATURE_TABLET_MODE_DPTC
-	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC
 
 config BOARD_GOOGLE_CRYSTALDRIFT
 	bool "->  Crystaldrift"
-	select BOARD_GOOGLE_BASEBOARD_SKYRIM
 
 config BOARD_GOOGLE_MARKARTH
 	bool "->  Markarth"
-	select BOARD_GOOGLE_BASEBOARD_SKYRIM
-	select SOC_AMD_COMMON_BLOCK_ACPI_DPTC