summaryrefslogtreecommitdiff
path: root/src/mainboard/google/corsola
diff options
context:
space:
mode:
authorHung-Te Lin <hungte@chromium.org>2022-09-06 14:32:05 +0800
committerFelix Held <felix-coreboot@felixheld.de>2022-09-07 09:20:25 +0000
commita01f8bc450d782c9b0859c8caaaa3df87fe5a854 (patch)
treeb6f301ea3e7d09e256489c7c3f5918211ff9473c /src/mainboard/google/corsola
parent70f30afa89b725aa8655bed881f823408ac54453 (diff)
soc/mediatek: a common implementation to register BL31 reset
The implementations of register_reset_to_bl31() are the same for MedaiTek platforms, so we extract them to soc/common/bl31.c. BUG=None TEST=build pass Change-Id: I297ea2e18a6d7e92236cf415844b166523616bdf Signed-off-by: Hung-Te Lin <hungte@chromium.org> Signed-off-by: Bo-Chen Chen <rex-bc.chen@mediatek.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/67359 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Diffstat (limited to 'src/mainboard/google/corsola')
-rw-r--r--src/mainboard/google/corsola/mainboard.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/mainboard/google/corsola/mainboard.c b/src/mainboard/google/corsola/mainboard.c
index c0a6449b39..3efedf8db8 100644
--- a/src/mainboard/google/corsola/mainboard.c
+++ b/src/mainboard/google/corsola/mainboard.c
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <bl31.h>
#include <bootmode.h>
#include <console/console.h>
#include <device/device.h>
#include <gpio.h>
+#include <soc/bl31.h>
#include <soc/msdc.h>
#include <soc/spm.h>
#include <soc/usb.h>
@@ -12,19 +12,6 @@
#include "display.h"
#include "gpio.h"
-#include <arm-trusted-firmware/include/export/plat/mediatek/common/plat_params_exp.h>
-
-static void register_reset_to_bl31(void)
-{
- static struct bl_aux_param_gpio param_reset = {
- .h = { .type = BL_AUX_PARAM_MTK_RESET_GPIO },
- .gpio = { .polarity = ARM_TF_GPIO_LEVEL_HIGH },
- };
-
- param_reset.gpio.index = GPIO_RESET.id;
- register_bl31_aux_param(&param_reset.h);
-}
-
static void configure_audio(void)
{
mtcmos_audio_power_on();
@@ -54,7 +41,8 @@ static void mainboard_init(struct device *dev)
if (spm_init())
printk(BIOS_ERR, "spm init failed, system suspend may not work\n");
- register_reset_to_bl31();
+ if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE))
+ register_reset_to_bl31(GPIO_RESET.id, true);
if (display_init_required()) {
if (configure_display() < 0)