| commit | 48c21eb3fc198630facd8675301d7648aaa46f59 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Tue Jun 18 08:34:56 2024 -0600 |
| committer | Tom Rini <trini@konsulko.com> | Tue Jun 18 08:34:56 2024 -0600 |
| tree | 5b92ec9c48faee61420bf7c8b6ed269b10b8ca0d | |
| parent | ca2f2feb9842cc6870d409530b2bf2b2cba274b3 [diff] | |
| parent | c9aa613ec2cdc9adeb1669ed1a0ed50c86ceff5d [diff] |
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
diff --git a/common/Kconfig b/common/Kconfig index 5e3070e..4bb9f08 100644 --- a/common/Kconfig +++ b/common/Kconfig
@@ -628,7 +628,7 @@ 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
diff --git a/configs/octeon_nic23_defconfig b/configs/octeon_nic23_defconfig index f7c3553..5a8db5a 100644 --- a/configs/octeon_nic23_defconfig +++ b/configs/octeon_nic23_defconfig
@@ -25,7 +25,6 @@ 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