diff --git a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
index 71b706d270..d3fa51be0a 100644
--- a/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
+++ b/src/mainboard/starlabs/byte_adl/variants/mk_ii/gpio.c
@@ -4,10 +4,9 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* H10:		UART0 RXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
-	/* H11:		UART0 TXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),				/* RXD */
+	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),				/* TXD */
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)
diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
index 4cc9888040..493ec7b595 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
@@ -4,10 +4,9 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* H10:		UART0 RXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
-	/* H11:		UART0 TXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),				/* RXD */
+	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),				/* TXD */
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)
diff --git a/src/mainboard/starlabs/starbook/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
index e29cd8199b..3ef15068e4 100644
--- a/src/mainboard/starlabs/starbook/variants/cml/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
@@ -9,10 +9,10 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* C20:	 UART2_RXD			*/
-	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
-	/* C21:	 UART2_TXD			*/
-	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),				/* RXD */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),				/* TXD */
+
 	/* E22:	BRD_ID0				*/
 	PAD_CFG_GPO(GPP_E22, 1, PLTRST),
 	/* E23:	BRD_ID1				*/
diff --git a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
index 9ab74148da..ae01749e20 100644
--- a/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
@@ -9,10 +9,9 @@
 
 /* Early pad configuration in bootblock. */
 const struct pad_config early_gpio_table[] = {
-	/* C20:	 UART2_RXD			*/
-	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
-	/* C21:	 UART2_TXD			*/
-	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),				/* RXD */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),				/* TXD */
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)
diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
index d1b915ab9e..e7f66ff026 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
@@ -4,10 +4,9 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* H08:	UART0 RXD			*/
-	PAD_CFG_NF(GPP_H08, NONE, DEEP, NF1),
-	/* H09:	UART0 TXD			*/
-	PAD_CFG_NF(GPP_H09, NONE, DEEP, NF1),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_H08, NONE, DEEP, NF1),				/* RXD */
+	PAD_CFG_NF(GPP_H09, NONE, DEEP, NF1),				/* TXD */
 
 	/* C00:	SMB_CLK				*/
 	PAD_CFG_NF(GPP_C00, NONE, DEEP, NF1),
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
index 542aa32b71..bae3564a05 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
@@ -4,10 +4,9 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* H10:		UART0 RXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
-	/* H11:		UART0 TXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),				/* RXD */
+	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),				/* TXD */
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)
diff --git a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
index 2526f7fa68..7e30109351 100644
--- a/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
@@ -9,10 +9,9 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* C20:	UART2_RXD_R			*/
-	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
-	/* C21:	UART2_TXD_R			*/
-	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),				/* RXD */
+	PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),				/* TXD */
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
index bfd06741d1..6890c273ea 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
@@ -4,10 +4,10 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* H10:		UART0 RXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
-	/* H11:		UART0 TXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),				/* RXD */
+	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),				/* TXD */
+
 	/* F12:		Board ID 0					*/
 	PAD_CFG_GPI_LOCK(GPP_F12, NONE, LOCK_CONFIG),
 	/* F13:		Board ID 1					*/
diff --git a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
index 67f9e407ce..8dea7a51cd 100644
--- a/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
+++ b/src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c
@@ -4,10 +4,9 @@
 
 /* Early pad configuration in bootblock */
 const struct pad_config early_gpio_table[] = {
-	/* H10:		UART0 RXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
-	/* H11:		UART0 TXD		Debug Connector		*/
-	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
+	/* Debug Connector */
+	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),				/* RXD */
+	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),				/* TXD */
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)