diff --git a/src/mainboard/amd/birman/Kconfig b/src/mainboard/amd/birman/Kconfig
index 235f63e1c1..83e3b823f7 100644
--- a/src/mainboard/amd/birman/Kconfig
+++ b/src/mainboard/amd/birman/Kconfig
@@ -1,15 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-config BOARD_AMD_BIRMAN_PHOENIX
-	select SOC_AMD_PHOENIX
-
-config BOARD_AMD_BIRMAN_GLINDA
-	select SOC_AMD_GLINDA
-
-if BOARD_AMD_BIRMAN_GLINDA || BOARD_AMD_BIRMAN_PHOENIX
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_AMD_BIRMAN_COMMON
+	def_bool n
 	select BOARD_ROMSIZE_KB_16384	# Birman actually has a 32MiB ROM
 	select EC_ACPI
 	select SOC_AMD_COMMON_BLOCK_USE_ESPI if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD
@@ -23,6 +15,16 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_SIMNOW_SUPPORTED
 	select SPI_FLASH_EXIT_4_BYTE_ADDR_MODE
 
+config BOARD_AMD_BIRMAN_PHOENIX
+	select BOARD_AMD_BIRMAN_COMMON
+	select SOC_AMD_PHOENIX
+
+config BOARD_AMD_BIRMAN_GLINDA
+	select BOARD_AMD_BIRMAN_COMMON
+	select SOC_AMD_GLINDA
+
+if BOARD_AMD_BIRMAN_COMMON
+
 config FMDFILE
 	default "src/mainboard/amd/birman/chromeos_glinda.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_GLINDA
 	default "src/mainboard/amd/birman/chromeos_phoenix.fmd" if CHROMEOS && BOARD_AMD_BIRMAN_PHOENIX