diff --git a/src/mainboard/siemens/mc_rpl/mainboard.c b/src/mainboard/siemens/mc_rpl/mainboard.c
index 69670aa0ec..44b11a0825 100644
--- a/src/mainboard/siemens/mc_rpl/mainboard.c
+++ b/src/mainboard/siemens/mc_rpl/mainboard.c
@@ -2,6 +2,7 @@
 
 #include <baseboard/gpio.h>
 #include <baseboard/variants.h>
+#include <bootstate.h>
 #include <cpu/x86/msr.h>
 #include <device/device.h>
 #include <device/pci_def.h>
@@ -14,6 +15,8 @@
 #include <soc/ramstage.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <timer.h>
+#include <timestamp.h>
 
 #define MAX_PATH_DEPTH		12
 #define MAX_NUM_MAPPINGS	10
@@ -91,6 +94,31 @@ enum cb_err mainboard_get_mac_address(struct device *dev, uint8_t mac[MAC_ADDR_L
 	return CB_ERR;
 }
 
+static void wait_for_legacy_dev(void *unused)
+{
+	uint32_t legacy_delay_us, us_since_boot;
+	struct stopwatch sw;
+
+	/* Open main hwinfo block. */
+	if (hwilib_find_blocks("hwinfo.hex") != CB_SUCCESS)
+		return;
+
+	/* Get legacy delay parameter from hwinfo. */
+	if (hwilib_get_field(LegacyDelay, (uint8_t *)&legacy_delay_us,
+			sizeof(legacy_delay_us)) != sizeof(legacy_delay_us))
+		return;
+
+	us_since_boot = get_us_since_boot();
+	/* No need to wait if the time since boot is already long enough.*/
+	if (us_since_boot > legacy_delay_us)
+		return;
+	stopwatch_init_msecs_expire(&sw, (legacy_delay_us - us_since_boot) / 1000);
+	printk(BIOS_NOTICE, "Wait remaining %d of %d us for legacy devices...",
+			legacy_delay_us - us_since_boot, legacy_delay_us);
+	stopwatch_wait_until_expired(&sw);
+	printk(BIOS_NOTICE, " done!\n");
+}
+
 void mainboard_silicon_init_params(FSP_S_CONFIG *params)
 {
 	params->Eist = 0;
@@ -130,3 +158,5 @@ struct chip_operations mainboard_ops = {
 	.init = mainboard_init,
 	.final = mainboard_final,
 };
+
+BOOT_STATE_INIT_ENTRY(BS_DEV_ENUMERATE, BS_ON_ENTRY, wait_for_legacy_dev, NULL);