1 files changed, 35 insertions, 0 deletions
diff --git a/patches/edk2/0001-MdeModulePkg-add-LockBoxNullLib-for-IA32-X64-in-.dsc.patch b/patches/edk2/0001-MdeModulePkg-add-LockBoxNullLib-for-IA32-X64-in-.dsc.patch
new file mode 100644
index 0000000..3eb926b
--- /dev/null
+++ b/patches/edk2/0001-MdeModulePkg-add-LockBoxNullLib-for-IA32-X64-in-.dsc.patch
@@ -0,0 +1,35 @@
+From 16ac0837939d44f0d233c58de4279ba9ddafaf9f Mon Sep 17 00:00:00 2001
+From: Leif Lindholm <leif.lindholm@linaro.org>
+Date: Mon, 18 Mar 2019 14:06:55 +0000
+Subject: [PATCH] MdeModulePkg: add LockBoxNullLib for !IA32/X64 in .dsc
+
+Commit 05fd2a926833
+("MdeModulePkg/NvmExpressPei: Consume S3StorageDeviceInitList LockBox")
+added a dependency on LockBoxLib to NvmExpressPei, causing builds using
+MdeModulePkg.dsc to fail on architectures other than IA32/X64 with
+missing reference to
+gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode.
+
+Add a resolution for LockBoxNullLib for ARM/AARCH64 to restore builds.
+
+Contributed-under: TianoCore Contribution Agreement 1.1
+Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
+---
+ MdeModulePkg/MdeModulePkg.dsc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
+index 6cd1727a0d..6e27e9cb68 100644
+--- a/MdeModulePkg/MdeModulePkg.dsc
++++ b/MdeModulePkg/MdeModulePkg.dsc
+@@ -178,6 +178,7 @@ [LibraryClasses.common.MM_STANDALONE]
+ [LibraryClasses.ARM, LibraryClasses.AARCH64]
+   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
+   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf
++  LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
+ 
+   #
+   # It is not possible to prevent ARM compiler calls to generic intrinsic functions.
+-- 
+2.11.0
+