Merge pull request #1077 from dortania/sonoma-development

Preliminary support for macOS Sonoma
dortania · Oct 1, 2023 · 404e855 · 404e855
2 parents df6ca71 + 5683fed
commit 404e855
Show file tree

Hide file tree

Showing 67 changed files with 2,106 additions and 365 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,17 +9,36 @@
   - Drops Rosetta requirement on Apple Silicon Macs
   - Note building from source will require Python 3.11 or newer and up-to-date Python modules
 - 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)
+- Resolve incorrect RELEASE usage of OpenCore binaries when DEBUG enabled
+- Implement basic support for macOS Sonoma:
+  - Supports same range of hardware as Ventura, in addition to:
+    - iMac18,x
+    - MacBook10,1
+    - MacBookPro14,x
+      - [T1 chip currently unsupported in Sonoma](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1103)
+  - Resolved issues:
+    - Graphics Acceleration support for 3802 and non-Metal GPUs
+    - UI corruption on 31001 GPUs
+    - Wireless Networking for BCM94360, 4360, 4350, 4331 and 43224
+    - USB ethernet support for adapters based on ECM protocol (ex. Realtek)
+    - dGPU support for MacBookPro14,3
+    - S1X/S3X NVMe Drive Support
+    - PCIe-based FaceTime Camera support
+    - Bluetooth support by switching to dynamic VMM spoofing
 - Increment Binaries:
   - OpenCorePkg 0.9.3 - release
-  - Lilu 1.6.6 - release
-  - WhateverGreen 1.6.5 - release
-  - RestrictEvents 1.1.2 - release
+  - Lilu 1.6.7 - release
+  - WhateverGreen 1.6.6 - release
+  - RestrictEvents 1.1.3 - (rolling - 4f233dd)
   - FeatureUnlock 1.1.5 - release
   - DebugEnhancer 1.0.8 - release
   - CPUFriend 1.2.7 - release
   - BlueToolFixup 2.6.8 - rolling (2305aaa)
   - CryptexFixup 1.0.2 - release
-  - PatcherSupportPkg 1.2.6 - release
+  - PatcherSupportPkg 1.3.0 - release
 - Build Server Changes:
   - Upgrade Python backend to 3.11.5
   - Upgrade Python modules:
@@ -62,7 +81,7 @@
   - utilities.py:
     - Fix indexing error on Device Paths (thx [@Ausdauersportler](https://github.com/Ausdauersportler))
 - Increment Binaries:
-  - PatcherSupportPkg 1.2.2 - release
+- PatcherSupportPkg 1.2.2 - release
 
 ## 0.6.7
 - Resolve partition buttons overlapping in Install OpenCore UI

diff --git a/OpenCore-Patcher-GUI.spec b/OpenCore-Patcher-GUI.spec
@@ -1,15 +1,23 @@
 # -*- mode: python ; coding: utf-8 -*-
 
-import sys, os, time, subprocess
+import sys, os, time, subprocess, pathlib
 sys.path.append(os.path.abspath(os.getcwd()))
 from resources import constants
 block_cipher = None
 
+datas = [
+   ('payloads.dmg', '.'),
+   ('Universal-Binaries.dmg', '.'),
+
+]
+if pathlib.Path("DortaniaInternalResources.dmg").exists():
+   datas.append(('DortaniaInternalResources.dmg', '.'))
+
 
 a = Analysis(['OpenCore-Patcher-GUI.command'],
              pathex=[],
              binaries=[],
-             datas=[('payloads.dmg', '.'), ('Universal-Binaries.dmg', '.')],
+             datas=datas,
              hiddenimports=[],
              hookspath=[],
              hooksconfig={},

diff --git a/data/model_array.py b/data/model_array.py
@@ -8,6 +8,7 @@
     "MacBook7,1",
     "MacBook8,1",
     "MacBook9,1",
+    "MacBook10,1",
     # MacBook Air
     "MacBookAir2,1",
     "MacBookAir3,1",
@@ -46,6 +47,9 @@
     "MacBookPro13,1",
     "MacBookPro13,2",
     "MacBookPro13,3",
+    "MacBookPro14,1",
+    "MacBookPro14,2",
+    "MacBookPro14,3",
     # Mac Mini
     "Macmini3,1",
     "Macmini4,1",
@@ -76,6 +80,9 @@
     "iMac16,1",
     "iMac16,2",
     "iMac17,1",
+    "iMac18,1",
+    "iMac18,2",
+    "iMac18,3",
     # Mac Pro
     "MacPro3,1",
     "MacPro4,1",

diff --git a/data/pci_data.py b/data/pci_data.py
@@ -418,17 +418,17 @@ class nvidia_ids:
         0x1186,  # GK104 [GTX 660 Ti]
         0x1187,  # GK104 [GTX 760]
         0x1188,  # GK104 [GTX 690]
-        0x1189,  # GK104 [GTX 670]	
-        0x118a,  # GK104GL [GRID K520]	
-        0x118b,  # GK104GL [GRID K2 GeForce USM]	
-        0x118c,  # GK104 [GRID K2 NVS USM]	
+        0x1189,  # GK104 [GTX 670]
+        0x118a,  # GK104GL [GRID K520]
+        0x118b,  # GK104GL [GRID K2 GeForce USM]
+        0x118c,  # GK104 [GRID K2 NVS USM]
         0x118d,  # GK104GL [GRID K200 vGPU]
         0x118E,  # GK104 [GTX 760 OEM]
         0x118F,  # GK104GL [Tesla K10]
-        0x1191,  # GK104 [GTX 760 Rev. 2]	
-        0x1193,	 # GK104 [GTX 760 Ti OEM]	
-        0x1194,  # GK104GL [Tesla K8]	
-        0x1195,  # GK104 [GTX 660 Rev. 2]	
+        0x1191,  # GK104 [GTX 760 Rev. 2]
+        0x1193,	 # GK104 [GTX 760 Ti OEM]
+        0x1194,  # GK104GL [Tesla K8]
+        0x1195,  # GK104 [GTX 660 Rev. 2]
         0x1198,  # GK104M [GTX 880M]
         0x1199,  # GK104M [GTX 870M]
         0x119A,  # GK104M [GTX 860M]
@@ -458,8 +458,8 @@ class nvidia_ids:
         # GK106
         0x11C0,  # GK106 [GTX 660]
         0x11C2,  # GK106 [GTX 650 Ti BOOST]
-        0x11c3,  # GK106 [GTX 650 Ti OEM]	
-        0x11c4,  # GK106 [GTX 645 OEM]	
+        0x11c3,  # GK106 [GTX 650 Ti OEM]
+        0x11c4,  # GK106 [GTX 645 OEM]
         0x11c5,  # GK106 [GT 740]
         0x11C6,  # GK106 [GTX 650 Ti]
         0x11C7,  # GK106 [GTX 750 Ti]
@@ -627,10 +627,10 @@ class nvidia_ids:
 
         0x17c2, # GM200 [GTX TITAN X]
         0x17c8, # GM200 [GTX 980 Ti]
-        0x17f0,	# GM200GL [Quadro M6000]	
-        0x17f1, # GM200GL [Quadro M6000 24GB]	
+        0x17f0,	# GM200GL [Quadro M6000]
+        0x17f1, # GM200GL [Quadro M6000 24GB]
         0x17fd, # GM200GL [Tesla M40]
-        
+
         0x13c0,	# GM204 [GTX 980]
         0x13c1,	# GM204
         0x13c2,	# GM204 [GTX 970]
@@ -1171,6 +1171,13 @@ class broadcom_ids:
         0x43A0,  # BCM4360
     ]
 
+    # Not natively supported, but supported by AirportBrcmFixup
+    AirPortBrcmNICThirdParty = [
+        0x4357,  # BCM43225
+        0x43B1,  # BCM4352
+        0x43B2,  # BCM4352 (2.4 GHz)
+    ]
+
     AirPortBrcm4360 = [
         # AirPortBrcm4360 IDs (removed duplicates for 4360 class cards)
         0x4331,  # BCM94331

diff --git a/data/smbios_data.py b/data/smbios_data.py
@@ -259,7 +259,7 @@
         "FirmwareFeatures": "0x8FC0FE13F",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 12,
@@ -708,7 +708,7 @@
         ],
     },
     "MacBookPro3,1": {
-        "Marketing Name": "MacBook Pro (15-inch,  2.4 2.2GHz) ",
+        "Marketing Name": "MacBook Pro (15-inch,  2.4 2.2GHz)",
         "Board ID": "Mac-F4238BC8",
         "FirmwareFeatures": "0xC0001407",
         "SecureBootModel": None,
@@ -1251,7 +1251,7 @@
         ],
     },
     "MacBookPro13,2": {
-        "Marketing Name": "MacBook Pro (13-inch, 2016, Four Thunderbolt 3 Ports) ",
+        "Marketing Name": "MacBook Pro (13-inch, 2016, Four Thunderbolt 3 Ports)",
         "Board ID": "Mac-66E35819EE2D0D05",
         "FirmwareFeatures": "0x8FC0FE137",
         "SecureBootModel": None,
@@ -1294,7 +1294,7 @@
         "FirmwareFeatures": "0x8FF0FF57E",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 13,
@@ -1307,12 +1307,12 @@
         ],
     },
     "MacBookPro14,2": {
-        "Marketing Name": "MacBook Pro (13-inch, 2017, Four Thunderbolt 3 Ports) ",
+        "Marketing Name": "MacBook Pro (13-inch, 2017, Four Thunderbolt 3 Ports)",
         "Board ID": "Mac-CAD6701F7CEA0921",
         "FirmwareFeatures": "0x8FF0FF57E",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 13,
@@ -1330,7 +1330,7 @@
         "FirmwareFeatures": "0x8FF0FF57E",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART,
         "Screen Size": 15,
@@ -2495,7 +2495,7 @@
         "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703,
         "Ethernet Chipset": "Broadcom",
@@ -2513,7 +2513,7 @@
         "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703,
         "Ethernet Chipset": "Broadcom",
@@ -2532,7 +2532,7 @@
         "FirmwareFeatures": "0x8FD0FF576",
         "SecureBootModel": None,
         "CPU Generation": cpu_data.CPUGen.kaby_lake.value,
-        "Max OS Supported": os_data.os_data.max_os,
+        "Max OS Supported": os_data.os_data.ventura,
         "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC,
         "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703,
         "Ethernet Chipset": "Broadcom",