Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-watchdog

- cyclic: Rise default CYCLIC_MAX_CPU_TIME_US to 5000 (Jiaxun)

CI: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=371&view=results

common/Kconfig

@@ -628,7 +628,7 @@ if CYCLIC
 
 config CYCLIC_MAX_CPU_TIME_US
 	int "Sets the max allowed time for a cyclic function in us"
-	default 1000
+	default 5000
 	help
 	  The max allowed time for a cyclic function in us. If a functions
 	  takes longer than this duration this function will get unregistered

configs/octeon_nic23_defconfig

@@ -25,7 +25,6 @@ CONFIG_SYS_PBSIZE=276
 CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 # CONFIG_SYS_DEVICE_NULLDEV is not set
 CONFIG_CYCLIC=y
-CONFIG_CYCLIC_MAX_CPU_TIME_US=5000
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_BOARD_LATE_INIT=y