diff --git a/src/mainboard/intel/icelake_rvp/bootblock.c b/src/mainboard/intel/icelake_rvp/bootblock.c
index a8f7e41433..d7f3255974 100644
--- a/src/mainboard/intel/icelake_rvp/bootblock.c
+++ b/src/mainboard/intel/icelake_rvp/bootblock.c
@@ -5,7 +5,7 @@
 #include <bootblock_common.h>
 #include <soc/gpio.h>
 
-void bootblock_mainboard_init(void)
+void bootblock_mainboard_early_init(void)
 {
 	const struct pad_config *pads;
 	size_t num;
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_u/gpio.c b/src/mainboard/intel/icelake_rvp/variants/icl_u/gpio.c
index 286753a820..30e249c22e 100644
--- a/src/mainboard/intel/icelake_rvp/variants/icl_u/gpio.c
+++ b/src/mainboard/intel/icelake_rvp/variants/icl_u/gpio.c
@@ -86,6 +86,10 @@ PAD_CFG_GPO(GPP_H0, 1, DEEP),
 
 /* Early pad configuration in bootblock */
 static const struct pad_config early_gpio_table[] = {
+	/* UART2 RX */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
+	/* UART2 TX */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
 };
 
 const struct pad_config *variant_gpio_table(size_t *num)
diff --git a/src/mainboard/intel/icelake_rvp/variants/icl_y/gpio.c b/src/mainboard/intel/icelake_rvp/variants/icl_y/gpio.c
index 286753a820..30e249c22e 100644
--- a/src/mainboard/intel/icelake_rvp/variants/icl_y/gpio.c
+++ b/src/mainboard/intel/icelake_rvp/variants/icl_y/gpio.c
@@ -86,6 +86,10 @@ PAD_CFG_GPO(GPP_H0, 1, DEEP),
 
 /* Early pad configuration in bootblock */
 static const struct pad_config early_gpio_table[] = {
+	/* UART2 RX */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
+	/* UART2 TX */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
 };
 
 const struct pad_config *variant_gpio_table(size_t *num)