diff options
| author | Tom Rini | 2021-12-28 07:59:43 -0500 |
|---|---|---|
| committer | Tom Rini | 2021-12-28 07:59:56 -0500 |
| commit | 880f3ee4f52ab622b15c16cceb683083a3ebbe54 (patch) | |
| tree | 39a71127dea6826883d0316dae3838a0644e9aa4 /drivers | |
| parent | c9964879ab2a5db91d403a53cf243f753011f3de (diff) | |
| parent | d241d2c879ec2754ca93f4c5d623b82f75f7d1ce (diff) | |
Merge tag 'efi-2022-01-rc4-4' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc4-4
UEFI:
* allow for more than 16 KiB UEFI variable size when using StMM
Others:
* make watchdog sysreset compatible with separate poweroff driver
* avoid OpenSSL deprecation warnings
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sysreset/sysreset_watchdog.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/sysreset/sysreset_watchdog.c b/drivers/sysreset/sysreset_watchdog.c index 35efcac59dd..8a659ee9b97 100644 --- a/drivers/sysreset/sysreset_watchdog.c +++ b/drivers/sysreset/sysreset_watchdog.c @@ -20,9 +20,16 @@ static int wdt_reboot_request(struct udevice *dev, enum sysreset_t type) struct wdt_reboot_plat *plat = dev_get_plat(dev); int ret; - ret = wdt_expire_now(plat->wdt, 0); - if (ret) - return ret; + switch (type) { + case SYSRESET_COLD: + case SYSRESET_WARM: + ret = wdt_expire_now(plat->wdt, 0); + if (ret) + return ret; + break; + default: + return -ENOSYS; + } return -EINPROGRESS; } |