From: Tom Rini <trini@konsulko.com>
Date: Mon, 5 Jul 2021 15:20:30 +0000 (-0400)
Subject: Merge branch 'next'
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=6194b45a83bde42cd2f404123823e5b326702001;p=u-boot.git

Merge branch 'next'
---

6194b45a83bde42cd2f404123823e5b326702001
diff --cc configs/xilinx_zynqmp_virt_defconfig
index a3d944d94b,d7a6a3b4ac..5f32ca4930
--- a/configs/xilinx_zynqmp_virt_defconfig
+++ b/configs/xilinx_zynqmp_virt_defconfig
@@@ -187,4 -193,6 +193,5 @@@ CONFIG_OF_LIBFDT_OVERLAY=
  CONFIG_EFI_SET_TIME=y
  CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
  CONFIG_EFI_CAPSULE_ON_DISK=y
 -CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y
  CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y
+ CONFIG_EFI_SECURE_BOOT=y