|
@@ -419,12 +419,27 @@ int board_early_init_f(void)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+void spl_board_init(void)
|
|
|
+{
|
|
|
+ /*
|
|
|
+ * If booting from UART, disable MCU watchdog in SPL, since uploading
|
|
|
+ * U-Boot proper can take too much time and trigger it.
|
|
|
+ */
|
|
|
+ if (get_boot_device() == BOOT_DEVICE_UART)
|
|
|
+ disable_mcu_watchdog();
|
|
|
+}
|
|
|
+
|
|
|
int board_init(void)
|
|
|
{
|
|
|
/* address of boot parameters */
|
|
|
gd->bd->bi_boot_params = mvebu_sdram_bar(0) + 0x100;
|
|
|
|
|
|
- disable_mcu_watchdog();
|
|
|
+ /*
|
|
|
+ * If not booting from UART, MCU watchdog was not disabled in SPL,
|
|
|
+ * disable it now.
|
|
|
+ */
|
|
|
+ if (get_boot_device() != BOOT_DEVICE_UART)
|
|
|
+ disable_mcu_watchdog();
|
|
|
|
|
|
return 0;
|
|
|
}
|