diff options
| -rw-r--r-- | src/mainboard/intel/coffeelake_rvp/bootblock.c | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/mainboard/intel/coffeelake_rvp/bootblock.c b/src/mainboard/intel/coffeelake_rvp/bootblock.c index c39a8ff9ba..90833269e4 100644 --- a/src/mainboard/intel/coffeelake_rvp/bootblock.c +++ b/src/mainboard/intel/coffeelake_rvp/bootblock.c @@ -4,7 +4,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/coffeelake_rvp/variants/baseboard/gpio.c b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c index 5700f064b0..f9eba5c580 100644 --- a/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c +++ b/src/mainboard/intel/coffeelake_rvp/variants/baseboard/gpio.c @@ -107,8 +107,14 @@ static const struct pad_config gpio_table[] = { /* C17 : I2C0_SCL */ /* C18 : I2C1_SDA */ /* C19 : I2C1_SCL */ + + /* + * Note: It's unconfirmed if this redundancy to the bootblock table is necessary. + */ /* C20 : UART2_RXD */ + PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1), /* C21 : UART2_TXD */ + PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1), /* C22 : UART2_RTSB */ /* C23 : UART2_CTSB */ @@ -579,6 +585,10 @@ static const struct pad_config gpio_table[] = { /* Early pad configuration in bootblock */ static 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), }; const struct pad_config *__weak variant_gpio_table(size_t *num) |