Build: Migrate to edk2-stable202005

Changelog.md

@@ -11,6 +11,7 @@ OpenCore Changelog
 - Replaced `BlacklistAppleUpdate` with `run-efi-updater` NVRAM variable
 - Fixed reset value in `FadtEnableReset` ACPI quirk
 - Fixed freezes during boot option expansion with PXE boot entries
+- Updated underlying EDK II package to edk2-stable202005
 
 #### v0.5.9
 - Added full HiDPI support in OpenCanopy

Docs/Configuration.tex

@@ -2333,7 +2333,7 @@ entry choice will update till next manual reconfiguration.
   \textbf{Description}: Sets specific attributes for console.
 
   Text renderer supports colour arguments as a sum of foreground and background
-  colors according to UEFI specification. The value of black background and
+  colours according to UEFI specification. The value of black background and
   black foreground (\texttt{0}) is reserved. List of colour names:
 
   \begin{itemize}
@@ -5015,7 +5015,7 @@ functioning. Feature highlights:
   \textbf{Failsafe}: \texttt{false}\\
   \textbf{Description}: Some firmwares clear only part of screen when switching
   from graphics to text mode, leaving a fragment of previously drawn image visible.
-  This option fills the entire graphics screen with black color before switching to
+  This option fills the entire graphics screen with black colour before switching to
   text mode.
 
   \emph{Note}: This option only applies to \texttt{System} renderer.

Docs/Differences/Differences.tex

 \documentclass[]{article}
 %DIF LATEXDIFF DIFFERENCE FILE
 %DIF DEL PreviousConfiguration.tex   Tue Jun  2 03:55:18 2020
-%DIF ADD ../Configuration.tex        Tue Jun 16 21:05:41 2020
+%DIF ADD ../Configuration.tex        Wed Jun 17 21:25:43 2020
 
 \usepackage{lmodern}
 \usepackage{amssymb,amsmath}
@@ -2402,7 +2402,7 @@ entry choice will update till next manual reconfiguration.
   \textbf{Description}: Sets specific attributes for console.
 
   Text renderer supports colour arguments as a sum of foreground and background
-  colors according to UEFI specification. The value of black background and
+  \DIFdelbegin \DIFdel{colors }\DIFdelend \DIFaddbegin \DIFadd{colours }\DIFaddend according to UEFI specification. The value of black background and
   black foreground (\texttt{0}) is reserved. List of colour names:
 
   \begin{itemize}
@@ -5105,7 +5105,7 @@ functioning. Feature highlights:
   \textbf{Failsafe}: \texttt{false}\\
   \textbf{Description}: Some firmwares clear only part of screen when switching
   from graphics to text mode, leaving a fragment of previously drawn image visible.
-  This option fills the entire graphics screen with black color before switching to
+  This option fills the entire graphics screen with black \DIFdelbegin \DIFdel{color }\DIFdelend \DIFaddbegin \DIFadd{colour }\DIFaddend before switching to
   text mode.
 
   \emph{Note}: This option only applies to \texttt{System} renderer.

Patches/0002-MdePkg-Workaround-SafeString-from-BaseLib-misprarsin.patch

-From 5873c1446d94f03a2111db9d0b78a1637e4a16bb Mon Sep 17 00:00:00 2001
-From: Vitaly Cheptsov <vit9696@protonmail.com>
-Date: Wed, 13 May 2020 22:10:10 +0300
-Subject: [PATCH 1/1] MdePkg: Workaround SafeString from BaseLib misprarsing
- data
-
-REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2054
-
-Attempts to upstream this failed due to sabotage from Intel.
-Refer to edk2-devel mailing list for more details.
----
- MdePkg/Library/BaseLib/SafeString.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/MdePkg/Library/BaseLib/SafeString.c b/MdePkg/Library/BaseLib/SafeString.c
-index 7dc03d2caa..478b3e9ea2 100644
---- a/MdePkg/Library/BaseLib/SafeString.c
-+++ b/MdePkg/Library/BaseLib/SafeString.c
-@@ -14,7 +14,6 @@
- 
- #define SAFE_STRING_CONSTRAINT_CHECK(Expression, Status)  \
-   do { \
--    ASSERT (Expression); \
-     if (!(Expression)) { \
-       return Status; \
-     } \
--- 
-2.24.2 (Apple Git-127)
-