diff options
| author | Tom Rini <[email protected]> | 2022-11-22 08:07:03 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-22 08:07:03 -0500 |
| commit | b94db9efe849200d993b7f8a4d0b024e99469599 (patch) | |
| tree | 65c81cde441b1eb0e737988ed4fb307331ab0d1f /include | |
| parent | 16e49a14b2af1421cbaeefb9ce8ee863e45fd71b (diff) | |
| parent | 5cbd0295392be32be3bb80da4fa3edee9a5c7287 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-watchdog
- watchdog: designware: make reset really optional (Quentin)
- watchdog: Drop GD_FLG_WDT_READY (Stefan)
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/global_data.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 88829126fb2..da17ac8cbc8 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -635,9 +635,9 @@ enum gd_flags { */ GD_FLG_LOG_READY = 0x10000, /** - * @GD_FLG_WDT_READY: watchdog is ready for use + * @GD_FLG_CYCLIC_RUNNING: cyclic_run is in progress */ - GD_FLG_WDT_READY = 0x20000, + GD_FLG_CYCLIC_RUNNING = 0x20000, /** * @GD_FLG_SKIP_LL_INIT: don't perform low-level initialization */ @@ -650,10 +650,6 @@ enum gd_flags { * @GD_FLG_FDT_CHANGED: Device tree change has been detected by tests */ GD_FLG_FDT_CHANGED = 0x100000, - /** - * @GD_FLG_CYCLIC_RUNNING: cyclic_run is in progress - */ - GD_FLG_CYCLIC_RUNNING = 0x200000, }; #endif /* __ASSEMBLY__ */ |