mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 06:31:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: mvebu: turris_omnia: disable MCU watchdog in board_late_init()

Browse Source 
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 <marek.behun@nic.cz>
Reviewed-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Marek Behún 2021-08-16 15:19:40 +02:00 committed by Stefan Roese
parent aeb0ca64db
commit e23162c805
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@ -434,6 +434,11 @@ int board_init(void)
/* address of boot parameters */ /* address of boot parameters */
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100; 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, * If not booting from UART, MCU watchdog was not disabled in SPL,
* disable it now. * disable it now.
@ -441,11 +446,6 @@ int board_init(void)
if (get_boot_device() != BOOT_DEVICE_UART) if (get_boot_device() != BOOT_DEVICE_UART)
disable_mcu_watchdog(); disable_mcu_watchdog();
return 0;
}
int board_late_init(void)
{
set_regdomain(); set_regdomain();
handle_reset_button(); handle_reset_button();
pci_init(); pci_init();