summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2017-10-19 21:23:50 (GMT)
committerTom Rini <trini@konsulko.com>2017-10-29 11:59:08 (GMT)
commit405835645a2db17152e6d6cdb4c9d1893f9501cc (patch)
treefd582f134ada74e147f6a70cc1f6a19384122be2
parentbb3d9ed3a9efc64cf05295167cddfe0adf2fb7d9 (diff)
downloadu-boot-405835645a2db17152e6d6cdb4c9d1893f9501cc.tar.xz
efi_loader: Disable env_save() call on boot
With the introduction of EFI variable support, we also wanted to persist these EFI variables. However, the way it was implemented we ended up persisting all U-Boot environment variables on every EFI boot. That could potentially lead to unexpected side effects because variables that were not supposed to be written to persisted env get written. It also means we may end up writing the environment more often than we should. For this release, let's just disable EFI variable persistence and instead implement it properly for the next one. Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Fixes: ad644e7c182 ("efi_loader: efi variable support") Signed-off-by: Alexander Graf <agraf@suse.de> Acked-by: Rob Clark <robdclark@gmail.com> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
-rw-r--r--lib/efi_loader/efi_boottime.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index f627340..743b848 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -1439,10 +1439,7 @@ static efi_status_t EFIAPI efi_exit_boot_services(void *image_handle,
/* Make sure that notification functions are not called anymore */
efi_tpl = TPL_HIGH_LEVEL;
-#if defined(CONFIG_CMD_SAVEENV) && !defined(CONFIG_ENV_IS_NOWHERE)
- /* save any EFI variables that have been written: */
- env_save();
-#endif
+ /* XXX Should persist EFI variables here */
board_quiesce_devices();