diff options
| author | Marek Behún <marek.behun@nic.cz> | 2021-08-16 16:19:40 +0300 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2021-09-01 09:09:24 +0300 |
| commit | e23162c805d46e7f6d11ba07f397b5e3e3750fda (patch) | |
| tree | 18d9c9e75e6dbb8e0e247804e1064747a2362e30 /board | |
| parent | aeb0ca64dbb5e4b1f58c5b723d92220e7729aa37 (diff) | |
| download | u-boot-e23162c805d46e7f6d11ba07f397b5e3e3750fda.tar.xz | |
arm: mvebu: turris_omnia: disable MCU watchdog in board_late_init()
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/CZ.NIC/turris_omnia/turris_omnia.c | 10 |
1 files 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(); |