Nico Huber has uploaded this change for review. ( https://review.coreboot.org/29051
Change subject: soc/mediatek: Convert to `board_reset()` ......................................................................
soc/mediatek: Convert to `board_reset()`
Note, we select MISSING_BOARD_RESET for MT8183 because it didn't select HAVE_HARD_RESET before. Although, it is implemented?
Change-Id: Ic850f2775ada5e6e543ffb92aaa033b9209596f5 Signed-off-by: Nico Huber nico.h@gmx.de --- M src/soc/mediatek/common/wdt.c M src/soc/mediatek/mt8173/Kconfig M src/soc/mediatek/mt8183/Kconfig 3 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/29051/1
diff --git a/src/soc/mediatek/common/wdt.c b/src/soc/mediatek/common/wdt.c index c261753..2f70454 100644 --- a/src/soc/mediatek/common/wdt.c +++ b/src/soc/mediatek/common/wdt.c @@ -57,7 +57,10 @@ return wdt_sta; }
-void do_hard_reset(void) +/* FIXME: Disabled for MT8183, probably by accident? */ +#if !IS_ENABLED(CONFIG_MISSING_BOARD_RESET) +void do_board_reset(void) { write32(&mtk_wdt->wdt_swrst, MTK_WDT_SWRST_KEY); } +#endif diff --git a/src/soc/mediatek/mt8173/Kconfig b/src/soc/mediatek/mt8173/Kconfig index de9b932..cf0c8d9 100644 --- a/src/soc/mediatek/mt8173/Kconfig +++ b/src/soc/mediatek/mt8173/Kconfig @@ -12,7 +12,6 @@ select HAVE_MONOTONIC_TIMER select GENERIC_UDELAY select GENERIC_GPIO_LIB - select HAVE_HARD_RESET select RTC
if SOC_MEDIATEK_MT8173 diff --git a/src/soc/mediatek/mt8183/Kconfig b/src/soc/mediatek/mt8183/Kconfig index b58be7f..4832fbf 100644 --- a/src/soc/mediatek/mt8183/Kconfig +++ b/src/soc/mediatek/mt8183/Kconfig @@ -11,6 +11,7 @@ select HAVE_UART_SPECIAL select HAVE_MONOTONIC_TIMER select COMPRESS_BOOTBLOCK + select MISSING_BOARD_RESET
if SOC_MEDIATEK_MT8183