summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/octopus/bootblock.c12
-rw-r--r--src/mainboard/google/octopus/variants/baseboard/gpio.c2
2 files changed, 11 insertions, 3 deletions
diff --git a/src/mainboard/google/octopus/bootblock.c b/src/mainboard/google/octopus/bootblock.c
index e0f037f4a9..1802695b7d 100644
--- a/src/mainboard/google/octopus/bootblock.c
+++ b/src/mainboard/google/octopus/bootblock.c
@@ -5,13 +5,19 @@
#include <ec/ec.h>
#include <soc/gpio.h>
-void bootblock_mainboard_init(void)
+void bootblock_mainboard_early_init(void)
{
- const struct pad_config *pads, *override_pads;
- size_t num, override_num;
+ const struct pad_config *pads;
+ size_t num;
pads = mainboard_early_bootblock_gpio_table(&num);
gpio_configure_pads(pads, num);
+};
+
+void bootblock_mainboard_init(void)
+{
+ const struct pad_config *pads, *override_pads;
+ size_t num, override_num;
/*
* Perform EC init before configuring GPIOs. This is because variant
diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c
index b99ec4fc19..85b0cc0afc 100644
--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c
+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c
@@ -294,6 +294,8 @@ const struct pad_config *__weak variant_early_override_gpio_table(size_t *num)
static const struct pad_config early_bootblock_gpio_table[] = {
PAD_NC(GPIO_154, NONE), /* LPC_CLKRUNB -- NC for eSPI */
+ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_64, UP_20K, DEEP, NF1, HIZCRx1, DISPUPD), /* LPSS_UART2_RXD */
+ PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_65, UP_20K, DEEP, NF1, TxLASTRxE, DISPUPD), /* LPSS_UART2_TXD */
};
const struct pad_config *mainboard_early_bootblock_gpio_table(size_t *num)