diff --git a/src/mainboard/siemens/mc_rpl/Kconfig b/src/mainboard/siemens/mc_rpl/Kconfig
index 76e2845420..cfb5712833 100644
--- a/src/mainboard/siemens/mc_rpl/Kconfig
+++ b/src/mainboard/siemens/mc_rpl/Kconfig
@@ -4,17 +4,17 @@ config BOARD_SIEMENS_BASEBOARD_MC_RPL
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select CPU_INTEL_SOCKET_LGA1700
+	select DRIVER_SIEMENS_NC_FPGA
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_INTEL_DPTF
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
+	select FSP_TYPE_IOT
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
-	select USE_SIEMENS_HWILIB
 	select SOC_INTEL_ALDERLAKE_PCH_P
 	select SOC_INTEL_RAPTORLAKE
-	select DRIVER_SIEMENS_NC_FPGA
-	select FSP_TYPE_IOT
+	select USE_SIEMENS_HWILIB
 
 config BOARD_SIEMENS_MC_RPL1
 	select BOARD_SIEMENS_BASEBOARD_MC_RPL
diff --git a/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig b/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig
index 47cceb0cc7..fdb35b66d5 100644
--- a/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig
+++ b/src/mainboard/siemens/mc_rpl/variants/mc_rpl1/Kconfig
@@ -4,14 +4,14 @@ if BOARD_SIEMENS_MC_RPL1
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
+	select DRIVER_INTEL_I210
 	select DRIVERS_UART_8250IO
 	select MAINBOARD_HAS_TPM2
 	select MEMORY_MAPPED_TPM
+	select NC_FPGA_POST_CODE
 	select SOC_INTEL_COMMON_BLOCK_LPC_COMB_ENABLE
 	select TPM_MEASURED_BOOT
 	select TPM_MEASURED_BOOT_INIT_BOOTBLOCK
-	select DRIVER_INTEL_I210
-	select NC_FPGA_POST_CODE
 
 config UART_FOR_CONSOLE
 	int