diff options
| author | Tom Rini <trini@konsulko.com> | 2022-02-26 10:21:39 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-26 10:21:39 -0500 |
| commit | a900c7f8161b74fc66ec715e68e7244b53f04298 (patch) | |
| tree | b5e161da65f1c397a6465a875e7e1a352ab83208 /lib/efi_loader/efi_watchdog.c | |
| parent | 7228ef94824c6442546431582dad0e3794264501 (diff) | |
| parent | 3fa9ed9ae3b30dd6e7f5e887c76d183ad72a44a2 (diff) | |
Merge tag 'efi-2022-04-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-04-rc3
Documentation:
* add man-page for fatload
* add SMBIOS table page
UEFI:
* partial fix for UEFI secure boot with intermediate certs
* disable watchdog when returning to command line
* reset system after capsule update
Diffstat (limited to 'lib/efi_loader/efi_watchdog.c')
| -rw-r--r-- | lib/efi_loader/efi_watchdog.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c index 87ca6c5b0b..d741076dcd 100644 --- a/lib/efi_loader/efi_watchdog.c +++ b/lib/efi_loader/efi_watchdog.c @@ -75,17 +75,6 @@ efi_status_t efi_watchdog_register(void) printf("ERROR: Failed to register watchdog event\n"); return r; } - /* - * The UEFI standard requires that the watchdog timer is set to five - * minutes when invoking an EFI boot option. - * - * Unified Extensible Firmware Interface (UEFI), version 2.7 Errata A - * 7.5. Miscellaneous Boot Services - EFI_BOOT_SERVICES.SetWatchdogTimer - */ - r = efi_set_watchdog(300); - if (r != EFI_SUCCESS) { - printf("ERROR: Failed to set watchdog timer\n"); - return r; - } + return EFI_SUCCESS; } |