7 files changed, 10 insertions, 39 deletions
diff --git a/src/mainboard/amd/chausie/Kconfig b/src/mainboard/amd/chausie/Kconfig
index 052d5d7446..86e18f5392 100644
--- a/src/mainboard/amd/chausie/Kconfig
+++ b/src/mainboard/amd/chausie/Kconfig
@@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select PCIEXP_COMMON_CLOCK
 	select PCIEXP_L1_SUB_STATE
 	select SOC_AMD_COMMON_BLOCK_ESPI_RETAIN_PORT80_EN if !SOC_AMD_COMMON_BLOCK_SIMNOW_BUILD
+	select AMD_FWM_POSITION_C20000_DEFAULT if CHROMEOS
+	select AMD_FWM_POSITION_820000_DEFAULT if !CHROMEOS
 	select SOC_AMD_COMMON_BLOCK_SIMNOW_SUPPORTED
 
 config FMDFILE
@@ -27,13 +29,6 @@ config MAINBOARD_DIR
 config MAINBOARD_PART_NUMBER
 	default "CHAUSIE"
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 3 if CHROMEOS
-	default 4
-	help
-	  TODO: might need to be adapted for better placement of files in cbfs
-
 config CHAUSIE_HAVE_MCHP_FW
 	bool "Have Microchip EC firmware?"
 	default n
diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
index 937d0bacf0..a167dff35b 100644
--- a/src/mainboard/amd/majolica/Kconfig
+++ b/src/mainboard/amd/majolica/Kconfig
@@ -10,6 +10,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select AMD_SOC_CONSOLE_UART
 	select PSP_INIT_ESPI
 	select MAINBOARD_HAS_CHROMEOS
+	select AMD_FWM_POSITION_C20000_DEFAULT if CHROMEOS
+	select AMD_FWM_POSITION_820000_DEFAULT if !CHROMEOS
 
 config FMDFILE
 	default "src/mainboard/amd/majolica/chromeos.fmd" if CHROMEOS
@@ -21,13 +23,6 @@ config MAINBOARD_DIR
 config MAINBOARD_PART_NUMBER
 	default "MAJOLICA"
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 3 if CHROMEOS
-	default 4
-	help
-	  TODO: might need to be adapted for better placement of files in cbfs
-
 config MAJOLICA_HAVE_MCHP_FW
 	bool "Have Microchip EC firmware?"
 	default n
diff --git a/src/mainboard/amd/mandolin/Kconfig b/src/mainboard/amd/mandolin/Kconfig
index 50b3e5d5bc..20ff1c6d38 100644
--- a/src/mainboard/amd/mandolin/Kconfig
+++ b/src/mainboard/amd/mandolin/Kconfig
@@ -12,6 +12,8 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_RESUME
 	select DRIVERS_UART_ACPI
 	select AMD_SOC_CONSOLE_UART if !AMD_LPC_DEBUG_CARD
+	select AMD_FWM_POSITION_420000_DEFAULT if BOARD_AMD_MANDOLIN
+	select AMD_FWM_POSITION_820000_DEFAULT if BOARD_AMD_CEREME
 
 config FMDFILE
 	default "src/mainboard/amd/mandolin/variants/\$(CONFIG_VARIANT_DIR)/board.fmd"
@@ -67,13 +69,6 @@ config ONBOARD_VGA_IS_PRIMARY
 	bool
 	default y
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 3 if BOARD_AMD_MANDOLIN
-	default 4 if BOARD_AMD_CEREME
-	help
-	  TODO: might need to be adapted for better placement of files in cbfs
-
 config MANDOLIN_HAVE_MCHP_FW
 	bool "Have Microchip EC firmware?"
 	default n
diff --git a/src/mainboard/google/guybrush/Kconfig b/src/mainboard/google/guybrush/Kconfig
index 8ddd3b1fe9..e66419b627 100644
--- a/src/mainboard/google/guybrush/Kconfig
+++ b/src/mainboard/google/guybrush/Kconfig
@@ -49,6 +49,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON_BLOCK_PSP_FUSE_SPL
 	select SYSTEM_TYPE_LAPTOP
 	select TPM_GOOGLE_CR50
+	select AMD_FWM_POSITION_C20000_DEFAULT
 
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
@@ -81,12 +82,6 @@ config MAINBOARD_PART_NUMBER
 	default "Nipperkin" if BOARD_GOOGLE_NIPPERKIN
 	default "Dewatt" if BOARD_GOOGLE_DEWATT
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 3
-	help
-	  TODO: might need to be adapted for better placement of files in cbfs
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x03
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig
index 92896e9d26..a4a7742f76 100644
--- a/src/mainboard/google/kahlee/Kconfig
+++ b/src/mainboard/google/kahlee/Kconfig
@@ -35,6 +35,7 @@ config BOARD_GOOGLE_BASEBOARD_KAHLEE
 	select HAVE_EM100_SUPPORT
 	select SYSTEM_TYPE_LAPTOP
 	select TPM_GOOGLE_CR50
+	select AMD_FWM_POSITION_F20000_DEFAULT
 
 if BOARD_GOOGLE_BASEBOARD_KAHLEE
 
@@ -104,10 +105,6 @@ config VBOOT_VBNV_OFFSET
 config CHROMEOS
 	select LP_DEFCONFIG_OVERRIDE if PAYLOAD_DEPTHCHARGE
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 1
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x01
diff --git a/src/mainboard/google/skyrim/Kconfig b/src/mainboard/google/skyrim/Kconfig
index dc681e8701..44ecfc4699 100644
--- a/src/mainboard/google/skyrim/Kconfig
+++ b/src/mainboard/google/skyrim/Kconfig
@@ -5,10 +5,6 @@ config BOARD_GOOGLE_BASEBOARD_SKYRIM
 
 if BOARD_GOOGLE_BASEBOARD_SKYRIM
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 3
-
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ACPI_S1_NOT_SUPPORTED
@@ -49,6 +45,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select PCIEXP_CLK_PM
 	select PCIEXP_COMMON_CLOCK
 	select PCIEXP_L1_SUB_STATE
+	select AMD_FWM_POSITION_C20000_DEFAULT
 
 config DEVICETREE
 	default "variants/baseboard/devicetree.cb"
diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index d01b023792..1abefb138c 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -51,6 +51,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select DRIVERS_USB_ACPI
 	select DRIVERS_UART_ACPI
 	select DRIVERS_GENERIC_BAYHUB_LV2
+	select AMD_FWM_POSITION_E20000_DEFAULT
 
 config ELOG_BOOT_COUNT_CMOS_OFFSET
 	int
@@ -126,10 +127,6 @@ config CHROMEOS
 	# Use default libpayload config
 	select LP_DEFCONFIG_OVERRIDE if PAYLOAD_DEPTHCHARGE
 
-config AMD_FWM_POSITION_INDEX
-	int
-	default 2
-
 config DRIVER_TPM_I2C_BUS
 	hex
 	default 0x03