diff options
| author | Tom Rini <trini@konsulko.com> | 2024-06-18 08:34:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-06-18 08:34:56 -0600 |
| commit | fe2ce09a0753634543c32cafe85eb87a625f76ca (patch) | |
| tree | 5b92ec9c48faee61420bf7c8b6ed269b10b8ca0d | |
| parent | 16324b43db3f2b4fbbc3b701893fcfc4104f33fb (diff) | |
| parent | 1fd754cebd38d7456caa82bef15225cbe77960ec (diff) | |
| download | u-boot-fe2ce09a0753634543c32cafe85eb87a625f76ca.zip u-boot-fe2ce09a0753634543c32cafe85eb87a625f76ca.tar.gz u-boot-fe2ce09a0753634543c32cafe85eb87a625f76ca.tar.bz2 | |
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
| -rw-r--r-- | common/Kconfig | 2 | ||||
| -rw-r--r-- | configs/octeon_nic23_defconfig | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/common/Kconfig b/common/Kconfig index 5e3070e..4bb9f08 100644 --- a/common/Kconfig +++ b/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 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_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 |