From 71366c309f6584b7bbf9c2aef889246155ea5423 Mon Sep 17 00:00:00 2001
From: Nicholas Sherlock <n.sherlock@gmail.com>
Date: Wed, 24 Jun 2020 12:17:03 +1200
Subject: [PATCH] Update all packages to latest master

OpenCore now supports booting from NVMe or virtio drives (if you set ScanPolicy accordingly)
---
 EFI/OC/config.plist | 24 +++++++++++++++++-------
 Makefile            |  6 +++++-
 src/AppleALC        |  2 +-
 src/Lilu            |  2 +-
 src/OcBinaryData    |  2 +-
 src/OpenCorePkg     |  2 +-
 src/VirtualSMC      |  2 +-
 src/WhateverGreen   |  2 +-
 8 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist
index e4a3035..45d9f70 100644
--- a/EFI/OC/config.plist
+++ b/EFI/OC/config.plist
@@ -45,7 +45,7 @@
 				<key>All</key>
 				<false/>
 				<key>Comment</key>
-				<string>Drop CpuPm</string>
+				<string>Delete CpuPm</string>
 				<key>Enabled</key>
 				<false/>
 				<key>OemTableId</key>
@@ -59,7 +59,7 @@
 				<key>All</key>
 				<false/>
 				<key>Comment</key>
-				<string>Drop Cpu0Ist</string>
+				<string>Delete Cpu0Ist</string>
 				<key>Enabled</key>
 				<false/>
 				<key>OemTableId</key>
@@ -169,6 +169,8 @@
 			<false/>
 			<key>ProvideCustomSlide</key>
 			<true/>
+			<key>ProvideMaxSlide</key>
+			<integer>0</integer>
 			<key>RebuildAppleMemoryMap</key>
 			<false/>
 			<key>SetupVirtualMap</key>
@@ -484,12 +486,16 @@
 		<dict>
 			<key>AppleDebug</key>
 			<false/>
+			<key>ApplePanic</key>
+			<false/>
 			<key>DisableWatchDog</key>
 			<false/>
 			<key>DisplayDelay</key>
 			<integer>0</integer>
 			<key>DisplayLevel</key>
 			<integer>2147483650</integer>
+			<key>SysReport</key>
+			<false/>
 			<key>Target</key>
 			<integer>3</integer>
 		</dict>
@@ -503,8 +509,6 @@
 			<false/>
 			<key>AuthRestart</key>
 			<false/>
-			<key>BlacklistAppleUpdate</key>
-			<false/>
 			<key>BootProtect</key>
 			<string>None</string>
 			<key>ExposeSensitiveData</key>
@@ -512,7 +516,7 @@
 			<key>HaltLevel</key>
 			<integer>2147483648</integer>
 			<key>ScanPolicy</key>
-			<integer>2032387</integer>
+			<integer>18809603</integer>
 			<key>Vault</key>
 			<string>Optional</string>
 		</dict>
@@ -570,6 +574,8 @@
 				<data>Rg==</data>
 				<key>boot-args</key>
 				<string>keepsyms=1</string>
+				<key>run-efi-updater</key>
+				<string>No</string>
 				<key>csr-active-config</key>
 				<data>AAAAAA==</data>
 				<key>prev-lang:kbd</key>
@@ -663,6 +669,8 @@
 		<dict>
 			<key>EnableJumpstart</key>
 			<true/>
+			<key>GlobalConnect</key>
+			<false/>
 			<key>HideVerbose</key>
 			<true/>
 			<key>JumpstartHotPlug</key>
@@ -776,16 +784,18 @@
 		</dict>
 		<key>Quirks</key>
 		<dict>
+			<key>DeduplicateBootOrder</key>
+			<true/>
 			<key>ExitBootServicesDelay</key>
 			<integer>0</integer>
 			<key>IgnoreInvalidFlexRatio</key>
 			<false/>
 			<key>ReleaseUsbOwnership</key>
 			<false/>
-			<key>DeduplicateBootOrder</key>
-			<true/>
 			<key>RequestBootVarRouting</key>
 			<true/>
+			<key>TscSyncTimeout</key>
+			<integer>0</integer>
 			<key>UnblockFsConnect</key>
 			<false/>
 		</dict>
diff --git a/Makefile b/Makefile
index 0570813..97773f6 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ OPENCORE_MODE=RELEASE
 
 OPENCORE_UDK_BUILD_DIR=src/OpenCorePkg/UDK/Build/OpenCorePkg/$(OPENCORE_MODE)_XCODE5/X64
 
-.DUMMY : all clean dist
+.DUMMY : all very-clean clean dist
 
 # Avoid submodules having their own directories as a dependency by moving that dependency to the top here:
 # (avoids rebuilding deps after they touch their directories during build)
@@ -154,6 +154,10 @@ $(SUBMODULES) :
 EFI/BOOT/ EFI/OC/Drivers/ EFI/OC/Tools/ :
 	mkdir $@
 
+# Also check out the UDK and its dependencies from scratch again - useful when build errors occur in UDK
+very-clean : clean
+	rm -rf src/OpenCorePkg/UDK
+
 clean :
 	rm -rf OpenCore.dmg OpenCoreEFIFolder.zip OpenCore-Image/ src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/UDK/Build \
 		src/AppleALC/build $(KEXTS) $(DRIVERS) $(TOOLS) $(MISC)
diff --git a/src/AppleALC b/src/AppleALC
index b69843c..7115d13 160000
--- a/src/AppleALC
+++ b/src/AppleALC
@@ -1 +1 @@
-Subproject commit b69843c2d94f414d4cfb7bfa2dd27e86df0cc937
+Subproject commit 7115d13452c546b5c02aecd3b2813a6a597f9e08
diff --git a/src/Lilu b/src/Lilu
index e827287..13c3cb9 160000
--- a/src/Lilu
+++ b/src/Lilu
@@ -1 +1 @@
-Subproject commit e827287b7f9ec424b20b8fa41d6497d92704bd72
+Subproject commit 13c3cb95235a7d7b58cd7cb7a879b13b074c2693
diff --git a/src/OcBinaryData b/src/OcBinaryData
index 88bab6c..d72b142 160000
--- a/src/OcBinaryData
+++ b/src/OcBinaryData
@@ -1 +1 @@
-Subproject commit 88bab6cf94655a0beaf82d279dbf5a5871e74612
+Subproject commit d72b142483ef6762044bba423ae64f40a1bf472a
diff --git a/src/OpenCorePkg b/src/OpenCorePkg
index 2f41d2a..32b4772 160000
--- a/src/OpenCorePkg
+++ b/src/OpenCorePkg
@@ -1 +1 @@
-Subproject commit 2f41d2abd1b2c71ae910163f63b8de1db1474e5b
+Subproject commit 32b4772c144be1d7fd80e75030836b60927646f3
diff --git a/src/VirtualSMC b/src/VirtualSMC
index 2d0436a..9e86110 160000
--- a/src/VirtualSMC
+++ b/src/VirtualSMC
@@ -1 +1 @@
-Subproject commit 2d0436a25fc50f85a121400867e2b23d4388d075
+Subproject commit 9e86110827de10ae1a64a73c47505c18cd5ff022
diff --git a/src/WhateverGreen b/src/WhateverGreen
index 278137d..8ebb271 160000
--- a/src/WhateverGreen
+++ b/src/WhateverGreen
@@ -1 +1 @@
-Subproject commit 278137d076e0945d3ce704fcebb0003a942a5ca2
+Subproject commit 8ebb2716c6efa24ad8088166f1b4c768a2f73130