Sync OpenCorePkg

CHANGELOG.md

@@ -11,11 +11,14 @@
 - Resolve USB ethernet support in macOS Sonoma
   - For Ethernet dongles based on ECM protocol (ex. Realtek)
 - Update font handling code, fixing font issues on Yosemite and El Capitan
+- Add `OpenLegacyBoot.efi` for Macs with CSM
+  - Allows for booting CSM-based OSes (ex. Windows 7)
+  - Applicable for Ivy Bridge and older Macs (excluding MacPro6,1)
 - Increment Binaries:
-  - OpenCorePkg 0.9.3 - release
-  - Lilu 1.6.6 - release
-  - WhateverGreen 1.6.5 - release
-  - RestrictEvents 1.1.2 - release
+  - OpenCorePkg 0.9.5 - release
+  - Lilu 1.6.7 - release
+  - WhateverGreen 1.6.6 - release
+  - RestrictEvents 1.1.3 - (rolling - 0febd7e)
   - FeatureUnlock 1.1.5 - release
   - DebugEnhancer 1.0.8 - release
   - CPUFriend 1.2.7 - release

payloads/Config/config.plist

@@ -2360,6 +2360,8 @@
 			<true/>
 			<key>HideAuxiliary</key>
 			<true/>
+			<key>InstanceIdentifier</key>
+			<string></string>
 			<key>LauncherPath</key>
 			<string>Default</string>
 			<key>LauncherOption</key>
@@ -2876,6 +2878,18 @@
 				<key>LoadEarly</key>
 				<false/>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string></string>
+				<key>Path</key>
+				<string>OpenLegacyBoot.efi</string>
+				<key>Enabled</key>
+				<false/>
+				<key>Arguments</key>
+				<string></string>
+				<key>LoadEarly</key>
+				<false/>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string></string>
@@ -3052,6 +3066,8 @@
 			<integer>-1</integer>
 			<key>ResizeUsePciRbIo</key>
 			<false/>
+			<key>ShimRetainProtocol</key>
+			<false/>
 			<key>TscSyncTimeout</key>
 			<integer>0</integer>
 			<key>UnblockFsConnect</key>

resources/build/firmware.py

@@ -212,6 +212,15 @@ class BuildFirmware:
             shutil.copy(self.constants.link_rate_driver_path, self.constants.drivers_path)
             support.BuildSupport(self.model, self.constants, self.config).get_efi_binary_by_path("FixPCIeLinkRate.efi", "UEFI", "Drivers")["Enabled"] = True
 
+        # CSM check
+        # For model support, check for GUID in firmware and as well as Bootcamp Assistant's Info.plist ('PreUEFIModels' key)
+        # Ref: https://github.com/acidanthera/OpenCorePkg/blob/0.9.5/Platform/OpenLegacyBoot/OpenLegacyBoot.c#L19
+        if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.ivy_bridge.value and self.model != "MacPro6,1":
+            logging.info("- Enabling CSM support")
+            support.BuildSupport(self.model, self.constants, self.config).get_efi_binary_by_path("OpenLegacyBoot.efi", "UEFI", "Drivers")["Enabled"] = True
+        else:
+            # Shipped alongside OpenCorePkg, so remove if unused
+            (self.constants.drivers_path / Path("OpenLegacyBoot.efi")).unlink()
 
     def _firmware_compatibility_handling(self) -> None:
         """