diff options
-rw-r--r-- | src/mainboard/google/geralt/mainboard.c | 6 | ||||
-rw-r--r-- | src/soc/mediatek/mt8188/Makefile.inc | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/mainboard/google/geralt/mainboard.c b/src/mainboard/google/geralt/mainboard.c index 75b8bb5e4b..ddcb1bb000 100644 --- a/src/mainboard/google/geralt/mainboard.c +++ b/src/mainboard/google/geralt/mainboard.c @@ -1,14 +1,20 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <device/device.h> +#include <soc/bl31.h> #include <soc/msdc.h> #include <soc/usb.h> +#include "gpio.h" + static void mainboard_init(struct device *dev) { mtk_msdc_configure_emmc(true); mtk_msdc_configure_sdcard(); setup_usb_host(); + + if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE)) + register_reset_to_bl31(GPIO_AP_EC_WARM_RST_REQ.id, true); } static void mainboard_enable(struct device *dev) diff --git a/src/soc/mediatek/mt8188/Makefile.inc b/src/soc/mediatek/mt8188/Makefile.inc index 70ec42ae7f..3f83cbc5b7 100644 --- a/src/soc/mediatek/mt8188/Makefile.inc +++ b/src/soc/mediatek/mt8188/Makefile.inc @@ -29,6 +29,7 @@ romstage-y += ../common/pmif_spmi.c pmif_spmi.c romstage-y += ../common/rtc.c ../common/rtc_osc_init.c ../common/rtc_mt6359p.c ramstage-y += ../common/auxadc.c +ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += ../common/bl31.c ramstage-y += ../common/devapc.c devapc.c ramstage-y += ../common/dfd.c ramstage-y += ../common/dpm.c |