Dear Tom,

please, merge into origin/next.

@Takahiro, Ilias, Sughosh
*Thanks a lot for all your contributions this year.*

The following changes since commit 958b9e2482538ebfeb2e1161257603d4dec498cb:

  Merge tag 'dm-next-23dec20' of git://git.denx.de/u-boot-dm into next
(2020-12-23 18:10:15 -0500)

are available in the Git repository at:

  https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-next

for you to fetch changes up to c35df7c9e43eaf5f8bf2113a58ea257291988589:

  qemu: arm64: Add documentation for capsule update (2020-12-31
14:41:31 +0100)

Gitlab CI showed no problems:
https://gitlab.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/5718

----------------------------------------------------------------
Pull request for UEFI sub-system for next

* UEFI capsule authentication
* UEFI capsule update on QEMU ARM
* fsuuid command for FAT file system
* bug fixes

----------------------------------------------------------------
Heinrich Schuchardt (10):
      efi_loader: make variable store size customizable
      fs: fat: eliminate DIRENTSPERBLOCK() macro
      fs/fat: implement fsuuid command
      efi_loader: missing parentheses after if
      efi_loader: escape key handling
      efi_loader: avoid invalid free
      efi_loader: efi_signal_event() fix comment typos
      efi_loader: describe struct efi_loaded_image_obj
      efi_loader: use after free in efi_exit()
      efi_loader: event queueing

Ilias Apalodimas (4):
      efi_loader: Extra checks while opening an OPTEE session
      efi_loader: Remove unused headers from efi_load_initrd.c
      efi_loader: Remove unconditional installation of file2 protocol
for initrd
      efi_loader: Add size checks to efi_create_indexed_name()

Sughosh Ganu (14):
      mkeficapsule: Add support for embedding public key in a dtb
      qemu: arm: Initialise virtio devices in board_late_init
      crypto: Fix the logic to calculate hash with authattributes set
      qemu: common: Add support for dynamic mtdparts for the platform
      qemu: common: Set dfu_alt_info variable for the platform
      fsp: Move and rename fsp_types.h file
      efi_loader: Add logic to parse EDKII specific fmp payload header
      dfu_mtd: Add provision to unlock mtd device
      efi_loader: Make the pkcs7 header parsing function an extern
      efi_loader: Re-factor code to build the signature store from efi
signature list
      efi: capsule: Add support for uefi capsule authentication
      efi_loader: Enable uefi capsule authentication
      efidebug: capsule: Add a command to update capsule on disk
      qemu: arm64: Add documentation for capsule update

 arch/arm/mach-qemu/Kconfig                         |   2 +
 arch/x86/include/asm/fsp/fsp_support.h             |   3 +-
 board/emulation/common/Kconfig                     |  15 ++
 board/emulation/common/Makefile                    |   5 +
 board/emulation/common/qemu_capsule.c              |  48 +++++
 board/emulation/common/qemu_dfu.c                  |  68 ++++++
 board/emulation/common/qemu_mtdparts.c             |  82 ++++++++
 board/emulation/qemu-arm/Kconfig                   |   8 +
 board/emulation/qemu-arm/qemu-arm.c                |   5 +
 cmd/efidebug.c                                     |  14 ++
 doc/board/emulation/index.rst                      |   1 +
 doc/board/emulation/qemu_capsule_update.rst        | 210
+++++++++++++++++++
 drivers/dfu/dfu_mtd.c                              |  20 +-
 fs/fat/fat.c                                       |  23 +-
 fs/fs.c                                            |   2 +-
 include/efi_api.h                                  |  18 ++
 include/efi_loader.h                               |  23 +-
 include/efi_variable.h                             |   2 +-
 include/fat.h                                      |  13 +-
 .../asm/fsp/fsp_types.h => include/signatures.h    |   6 +-
 lib/crypto/pkcs7_verify.c                          |  37 +++-
 lib/efi_loader/Kconfig                             |  31 +++
 lib/efi_loader/efi_bootmgr.c                       |   2 +-
 lib/efi_loader/efi_boottime.c                      |  25 ++-
 lib/efi_loader/efi_capsule.c                       | 129 +++++++++++-
 lib/efi_loader/efi_console.c                       |  12 ++
 lib/efi_loader/efi_firmware.c                      |  77 ++++++-
 lib/efi_loader/efi_load_initrd.c                   |   8 +-
 lib/efi_loader/efi_setup.c                         |   5 -
 lib/efi_loader/efi_signature.c                     | 192 +++++++++++++----
 lib/efi_loader/efi_string.c                        |  10 +-
 lib/efi_loader/efi_variable.c                      |  93 +-------
 lib/efi_loader/efi_variable_tee.c                  |  20 +-
 test/unicode_ut.c                                  |   2 +-
 tools/Makefile                                     |   1 +
 tools/mkeficapsule.c                               | 233
+++++++++++++++++++--
 36 files changed, 1240 insertions(+), 205 deletions(-)
 create mode 100644 board/emulation/common/Kconfig
 create mode 100644 board/emulation/common/Makefile
 create mode 100644 board/emulation/common/qemu_capsule.c
 create mode 100644 board/emulation/common/qemu_dfu.c
 create mode 100644 board/emulation/common/qemu_mtdparts.c
 create mode 100644 doc/board/emulation/qemu_capsule_update.rst
 rename arch/x86/include/asm/fsp/fsp_types.h => include/signatures.h (95%)

Reply via email to