random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: Use sysreset instead of reset command

Browse Source 
Use sysreset_walk_halt() directly from reset-after-capsule-on-disk
feature to reboot (cold reset) machine instead of using reset command
interface, since this is not a command.
Note that this will make CONFIG_EFI_CAPSULE_ON_DISK depending on
the CONFIG_SYSRESET.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masami Hiramatsu 2022-03-21 22:37:56 +09:00 committed by Heinrich Schuchardt
parent 39bdf11580
commit 7660cfee0f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/efi_loader/Kconfig
View File

@ -136,6 +136,7 @@ config EFI_RUNTIME_UPDATE_CAPSULE
config EFI_CAPSULE_ON_DISK config EFI_CAPSULE_ON_DISK
bool "Enable capsule-on-disk support" bool "Enable capsule-on-disk support"
depends on SYSRESET
select EFI_HAVE_CAPSULE_SUPPORT select EFI_HAVE_CAPSULE_SUPPORT
help help
Select this option if you want to use capsule-on-disk feature, Select this option if you want to use capsule-on-disk feature,

5
lib/efi_loader/efi_capsule.c
View File

@ -18,6 +18,7 @@
#include <malloc.h> #include <malloc.h>
#include <mapmem.h> #include <mapmem.h>
#include <sort.h> #include <sort.h>
#include <sysreset.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <crypto/pkcs7.h> #include <crypto/pkcs7.h>
@ -1157,9 +1158,9 @@ efi_status_t efi_launch_capsules(void)
* UEFI spec requires to reset system after complete processing capsule * UEFI spec requires to reset system after complete processing capsule
* update on the storage. * update on the storage.
*/ */
log_info("Reboot after firmware update"); log_info("Reboot after firmware update.\n");
/* Cold reset is required for loading the new firmware. */ /* Cold reset is required for loading the new firmware. */
do_reset(NULL, 0, 0, NULL); sysreset_walk_halt(SYSRESET_COLD);
hang(); hang();
/* not reach here */ /* not reach here */