summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/cherry/bootblock.c8
-rw-r--r--src/soc/mediatek/mt8195/Makefile.inc1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mainboard/google/cherry/bootblock.c b/src/mainboard/google/cherry/bootblock.c
index c506cafc27..c811c4eb2e 100644
--- a/src/mainboard/google/cherry/bootblock.c
+++ b/src/mainboard/google/cherry/bootblock.c
@@ -5,6 +5,7 @@
#include <gpio.h>
#include <soc/gpio.h>
#include <soc/i2c.h>
+#include <soc/pcie.h>
#include <soc/spi.h>
#include "gpio.h"
@@ -43,6 +44,13 @@ static void usb3_hub_reset(void)
void bootblock_mainboard_init(void)
{
+ /*
+ * Initialize PCIe pinmux and assert PERST# early to reduce
+ * the impact of 100ms delay.
+ */
+ if (CONFIG(PCI))
+ mtk_pcie_pre_init();
+
mtk_i2c_bus_init(CONFIG_DRIVER_TPM_I2C_BUS, I2C_SPEED_FAST);
mtk_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, SPI_PAD0_MASK, 3 * MHz, 0);
nor_set_gpio_pinmux();
diff --git a/src/soc/mediatek/mt8195/Makefile.inc b/src/soc/mediatek/mt8195/Makefile.inc
index b83fc3229f..0a305d9961 100644
--- a/src/soc/mediatek/mt8195/Makefile.inc
+++ b/src/soc/mediatek/mt8195/Makefile.inc
@@ -9,6 +9,7 @@ bootblock-y += ../common/gpio.c gpio.c
bootblock-y += ../common/i2c.c i2c.c
bootblock-y += ../common/mmu_operations.c
bootblock-y += ../common/tracker.c ../common/tracker_v2.c
+bootblock-$(CONFIG_PCI) += pcie.c
bootblock-y += ../common/pll.c pll.c
bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c
bootblock-y += ../common/timer.c timer.c