Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

Patch queue for efi - 2018-09-26

A lot of goodness in this release. We're *very* close to running the
UEFI Shell and SCT natively. The only missing piece are HII protocols.

  - FAT write support (needed for SCT)
  - improved FAT directory support (needed for SCT)
  - RTC support with QEMU -M virt
  - Sandbox support (run UEFI binaries in Linux - yay)
  - Proper UTF-16 support
  - EFI_UNICODE_COLLATION_PROTOCOL support (for UEFI Shell)
  - EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL support (for UEFI Shell)
  - Fix window size determination
  - Fix Tegra by explicitly unmapping RAM
  - Clean up handle entanglement
  - Lots of generic code cleanup

[trini: Fixup merge conflict in include/configs/qemu-arm.h]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc include/configs/qemu-arm.h
index 5a12a32d398202909f47e8b0aa9469b9d4fb7e7a,f09a0e06b7618d321b54ab0116e15cd43ed21113..fedc4662fa188441a72461c220ed8ebb712e0f51
--- 1/include/configs/qemu-arm.h
--- 2/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@@ -20,9 -20,9 +20,6 @@@
  /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */
  #define CONFIG_SYS_HZ                       1000
  
- /* QEMU emulates the ARM AMBA PL031 RTC */
- #define CONFIG_SYS_RTC_PL031_BASE     0x09010000
 -/* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
 -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
--
  /* Environment options */
  #define CONFIG_ENV_SIZE                               SZ_64K
  

diff --cc scripts/config_whitelist.txt
Simple merge