Merge tag 'efi-2022-07-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request for efi-2022-07-rc1-2

Documentation:

* Describe env command

UEFI

* simplify Unicode string functions
* clean up the usage of GUIDs for capsule updates

diff --combined configs/sandbox64_defconfig
index a13fa2e,db748bb..d7f22b3
--- 1/configs/sandbox64_defconfig
--- 2/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@@ -1,4 -1,5 +1,4 @@@
  CONFIG_SYS_TEXT_BASE=0
 -CONFIG_SYS_MALLOC_LEN=0x2000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox64"
@@@ -245,7 -246,6 +245,6 @@@ CONFIG_ERRNO_STR=
  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
  CONFIG_TEST_FDTDEC=y
  CONFIG_UNIT_TEST=y

diff --combined configs/sandbox_defconfig
index 4d3e4f3,0dfc2d8..06dbf38
--- 1/configs/sandbox_defconfig
--- 2/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@@ -1,4 -1,5 +1,4 @@@
  CONFIG_SYS_TEXT_BASE=0
 -CONFIG_SYS_MALLOC_LEN=0x2000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox"
@@@ -318,7 -319,6 +318,6 @@@ CONFIG_SHA384=
  CONFIG_ERRNO_STR=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
  CONFIG_TEST_FDTDEC=y

diff --combined configs/sandbox_flattree_defconfig
index d799f7d,27dd38a..2e530ac
--- 1/configs/sandbox_flattree_defconfig
--- 2/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@@ -1,4 -1,5 +1,4 @@@
  CONFIG_SYS_TEXT_BASE=0
 -CONFIG_SYS_MALLOC_LEN=0x2000000
  CONFIG_NR_DRAM_BANKS=1
  CONFIG_ENV_SIZE=0x2000
  CONFIG_DEFAULT_DEVICE_TREE="sandbox"
@@@ -27,6 -28,7 +27,7 @@@ CONFIG_CMD_BOOTEFI_HELLO=
  CONFIG_CMD_ASKENV=y
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_ERASEENV=y
+ CONFIG_CMD_NVEDIT_EFI=y
  CONFIG_CMD_NVEDIT_INFO=y
  CONFIG_CMD_NVEDIT_LOAD=y
  CONFIG_CMD_NVEDIT_SELECT=y
@@@ -208,3 -210,7 +209,7 @@@ CONFIG_HEXDUMP=
  CONFIG_UNIT_TEST=y
  CONFIG_UT_TIME=y
  CONFIG_UT_DM=y
+ CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y
+ CONFIG_EFI_CAPSULE_ON_DISK=y
+ CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y
+ CONFIG_DFU_SF=y