Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-marvell into...

- Handling all DM watchdogs in watchdog_reset() (Rasmus)

diff --combined configs/sandbox64_defconfig
index 846417d,6cad90b..df9633d
--- 1/configs/sandbox64_defconfig
--- 2/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@@ -3,14 -3,12 +3,14 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_ENV_SIZE=0x2000
 +CONFIG_SYS_MALLOC_LEN=0x2000000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox64"
  CONFIG_PRE_CON_BUF_ADDR=0x100000
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
  CONFIG_SANDBOX64=y
  CONFIG_DEBUG_UART=y
  CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_VERBOSE=y
@@@ -225,7 -223,9 +225,9 @@@ CONFIG_OSD=
  CONFIG_SANDBOX_OSD=y
  CONFIG_SPLASH_SCREEN_ALIGN=y
  CONFIG_VIDEO_BMP_RLE8=y
+ # CONFIG_WATCHDOG_AUTOSTART is not set
  CONFIG_WDT=y
+ CONFIG_WDT_GPIO=y
  CONFIG_WDT_SANDBOX=y
  CONFIG_FS_CBFS=y
  CONFIG_FS_CRAMFS=y

diff --combined configs/sandbox_defconfig
index dd2f8e9,2b8d147..f1067b9
--- 1/configs/sandbox_defconfig
--- 2/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@@ -3,13 -3,11 +3,13 @@@ CONFIG_NR_DRAM_BANKS=
  CONFIG_SYS_MEMTEST_START=0x00100000
  CONFIG_SYS_MEMTEST_END=0x00101000
  CONFIG_ENV_SIZE=0x2000
 +CONFIG_SYS_MALLOC_LEN=0x2000000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox"
  CONFIG_PRE_CON_BUF_ADDR=0xf0000
  CONFIG_BOOTSTAGE_STASH_ADDR=0x0
  CONFIG_DEBUG_UART=y
  CONFIG_DISTRO_DEFAULTS=y
 +CONFIG_SYS_LOAD_ADDR=0x0
  CONFIG_FIT=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_FIT_RSASSA_PSS=y
@@@ -283,7 -281,9 +283,9 @@@ CONFIG_W1=
  CONFIG_W1_GPIO=y
  CONFIG_W1_EEPROM=y
  CONFIG_W1_EEPROM_SANDBOX=y
+ # CONFIG_WATCHDOG_AUTOSTART is not set
  CONFIG_WDT=y
+ CONFIG_WDT_GPIO=y
  CONFIG_WDT_SANDBOX=y
  CONFIG_FS_CBFS=y
  CONFIG_FS_CRAMFS=y