From: Tom Rini Date: Wed, 26 Sep 2018 19:14:02 +0000 (-0400) Subject: Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=0ae8dcfef7c890330c62bb34c724126ffc169bef;p=u-boot.git 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 --- 0ae8dcfef7c890330c62bb34c724126ffc169bef diff --cc include/configs/qemu-arm.h index 5a12a32d39,f09a0e06b7..fedc4662fa --- a/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