From e23162c805d46e7f6d11ba07f397b5e3e3750fda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Beh=C3=BAn?= Date: Mon, 16 Aug 2021 15:19:40 +0200 Subject: [PATCH] arm: mvebu: turris_omnia: disable MCU watchdog in board_late_init() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Disable MCU watchdog in board_late_init() instead of board_init(), so that it is disabled after U-Boot enables SOC watchdog instead of before. This way there is no window when the board is vulnerable. Signed-off-by: Marek Behún Reviewed-by: Pali Rohár Reviewed-by: Stefan Roese --- board/CZ.NIC/turris_omnia/turris_omnia.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index b0391c973d..bac78af04e 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -434,6 +434,11 @@ int board_init(void) /* address of boot parameters */ gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; + return 0; +} + +int board_late_init(void) +{ /* * If not booting from UART, MCU watchdog was not disabled in SPL, * disable it now. @@ -441,11 +446,6 @@ int board_init(void) if (get_boot_device() != BOOT_DEVICE_UART) disable_mcu_watchdog(); - return 0; -} - -int board_late_init(void) -{ set_regdomain(); handle_reset_button(); pci_init(); -- 2.39.5