Merge branch 'main' of https://github.com/dortania/OpenCore-Legacy-Patcher

# Conflicts:
#	CHANGELOG.md

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,6 @@ body:
       label: Machine Model
       description: What model was being patched?
       options:
-        - MacBook4,1
         - MacBook5,1
         - MacBook5,2
         - MacBook6,1

CHANGELOG.md

@@ -11,6 +11,11 @@
 - Add configuration for mediaanalysisd usage
   - For systems that are the primary iCloud Photo Library host, mediaanalysisd may be unstable on large amounts of unprocessed faces
   - Applicable to 3802-based GPUs (ie. Intel Ivy Bridge and Haswell iGPUs, Nvidia Kepler dGPUs)
+- Remove MacBook4,1 references
+  - Machine was never properly supported by OCLP
+- Restore support for Aquantia Aqtion 10GBe Ethernet for Pre-VT-d systems on 12.3 and newer
+  - i.e. MacPro5,1 with AQC107 expansion card running macOS Ventura/Monterey 12.6.x
+  - Thanks [@jazzzny](https://github.com/jazzzny)
 - Resolve AMD Vega support on pre-AVX2 Macs in macOS Ventura
   - Originally caused by regression from 0.6.2
 - Backend Changes:

README.md

@@ -93,6 +93,7 @@ To run the project from source, see here: [Build and run from source](./SOURCE.m
   * [FixPCIeLinkrate](https://github.com/joevt/joevtApps)
 * [Jazzzny](https://github.com/Jazzzny)
   * Research and various contributions to the project
+  * Aquantia Ethernet Patch
 * Amazing users who've graciously donate hardware:
   * [JohnD](https://forums.macrumors.com/members/johnd.53633/) - 2013 Mac Pro
   * [SpiGAndromeda](https://github.com/SpiGAndromeda) - AMD Vega 64

data/model_array.py

@@ -2,7 +2,6 @@
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 SupportedSMBIOS = [
     # MacBook
-    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -90,7 +89,6 @@ SupportedSMBIOS = [
 # Audio
 
 LegacyAudio = [
-    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",
@@ -175,7 +173,6 @@ ModernGPU = [
 ]
 
 LegacyGPU = [
-    "MacBook4,1",  # GMA X3100
     "MacBook5,1",  # Nvidia 9000
     "MacBook5,2",  # Nvidia 9000
     "MacBook6,1",  # Nvidia 9000
@@ -252,7 +249,7 @@ MacPro = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dort
 # MXM iMac
 MXMiMac = ["iMac11,1", "iMac11,2", "iMac11,3", "iMac10,1", "iMac12,1", "iMac12,2", "Dortania1,1"]
 
-NoAGPMSupport = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]
+NoAGPMSupport = ["MacBookPro4,1", "iMac7,1", "iMac8,1", "MacPro3,1", "Xserve2,1", "Dortania1,1"]
 
 AGDPSupport = [
     "MacBookPro9,1",
@@ -277,7 +274,6 @@ AGDPSupport = [
 ]
 
 Missing_USB_Map = [
-    "MacBook4,1",
     "MacBook5,1",
     "MacBook5,2",
     "MacBook6,1",

docs/ACCEL.md

@@ -64,12 +64,15 @@ Currently Zoom relies partially on Metal and so needs a small binary patch. Dosd
 * [Zoom Non-Metal Fix](http://dosdude1.com/catalina/zoomnonmetal-new.command.zip)
 
 ## Unable to grant special permissions to apps (ie. Camera Access to Zoom)
+Currently for Ventura 13.3 and newer, due to new patches required, permissions are yet again broken. Use TCCPlus in the Workaround dropdown to work around the issue.
 
-With version 0.2.5, this issue should be full resolved
+This issue is fully resolved for 13.2.1 and lower starting from 0.2.5.
 
-::: details 0.2.4 and older Work-Around
+::: details Workaround for 0.2.4, Ventura 13.3+
 
-Due to the usage of `amfi_get_out_of_my_way=1`, macOS will fail to prompt users for special permissions upon application start as well as omit the entires in System Preferences. To work around this, we recommend users install [tccplus](https://github.com/jslegendre/tccplus) to manage permissions.
+Due to the usage of amfi_get_out_of_my_way=1, macOS will fail to prompt users for special permissions upon application start as well as omit the entires in System Preferences. To work around this, we recommend users install tccplus to manage permissions.
+
+[Download TCCPlus](https://github.com/jslegendre/tccplus)
 
 Example usage with Discord and microphone permissions:
 

docs/MODELS.md

@@ -148,7 +148,7 @@ Regarding OS support, see below:
 | MacPro3,1 | Early 2008 | <span style="color:#30BCD5"> YES </span> | - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021)) <br/>- Potential boot issues with stock Bluetooth card, recommend removing to avoid kernel panics |
 | MacPro4,1 | Early 2009 | ^^ | - Everything is supported as long as GPU is Metal capable <br/> - UHCI/OHCI support in Public Beta, see current issues ([#1021](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/1021))|
 | MacPro5,1 | Mid 2010, Mid 2012 | ^^ | ^^ |
-| MacPro6,1 | Late 2013 | ^^ | - CPU Power Management currently unsupported<br/> - No DRM support |
+| MacPro6,1 | Late 2013 | ^^ | - DRM support is flaky |
 
 ### Xserve
 

docs/PATCHEXPLAIN.md

@@ -149,7 +149,7 @@ Below is a rundown of the main logic that OpenCore Legacy Patcher uses to gain n
 * GopPassThrough
   * Reason: Used for proper output on machines with UGA firmware but GOP GPU
   * Logic: Provide GOP protocol instances on top of UGA protocol instances
-  * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1
+  * Models: MacPro3,1, iMac7,1-8,1
 
 :::
 
@@ -299,7 +299,7 @@ Below is an explanation of what Kexts OpenCore Legacy Patcher will inject into m
 * SimpleMSR 
   * Reason: Disables BD PROCHOT to prevent firmware throttling on Nehalem+ MacBooks
 * LegacyKeyboardInjector
-  * Reason: Fixes function keys on MacBook4,1/MacBook5,2
+  * Reason: Fixes function keys on MacBook5,2
 
 
 :::

docs/TROUBLESHOOTING.md

@@ -3,11 +3,11 @@
 Here are some common errors that users may experience while using this patcher:
 
 * [OpenCore Legacy Patcher not launching](#opencore-legacy-patcher-not-launching)
-* [Stuck on `This version of Mac OS X is not supported on this platform`](#stuck-on-this-version-of-mac-os-x-is-not-supported-on-this-platform)
+* [Stuck on `This version of Mac OS X is not supported on this platform` or (🚫) Prohibited Symbol](#stuck-on-this-version-of-mac-os-x-is-not-supported-on-this-platform-or-(🚫)-prohibited-symbol)
 * [Cannot boot macOS without the USB](#cannot-boot-macos-without-the-usb)
 * [Infinite Recovery OS Booting](#infinite-recovery-os-reboot)
 * [Reboot when entering Hibernation (`Sleep Wake Failure`)](#reboot-when-entering-hibernation-sleep-wake-failure)
-* [How to Boot Big Sur Recovery](#how-to-boot-big-sur-recovery)
+* [How to Boot Recovery through OpenCore Legacy Patcher](#how-to-boot-recovery-through-opencore-legacy-patcher)
 * [Stuck on "Your Mac needs a firmware update"](#stuck-on-your-mac-needs-a-firmware-update)
 * [No Brightness Control](#no-brightness-control)
 * [Cannot connect Wi-Fi on Monterey with legacy cards](#cannot-connect-Wi-Fi-on-Monterey-with-legacy-cards)
@@ -29,15 +29,19 @@ If the application won't launch (e.g. icon will bounce in the Dock), try launchi
 /Applications/OpenCore-Patcher.app/Contents/MacOS/OpenCore-Patcher
 ```
 
-## Stuck on `This version of Mac OS X is not supported on this platform`
+## Stuck on `This version of Mac OS X is not supported on this platform` or (🚫) Prohibited Symbol
 
 This means macOS has detected an SMBIOS it does not support. To resolve this, ensure you're booting OpenCore **before** the macOS installer in the boot picker. Reminder that the option will be called `EFI Boot`.
 
 Once you've booted OpenCore at least once, your hardware should now auto-boot it until either an NVRAM reset occurs, or you remove the drive with OpenCore installed.
 
+However, if the 🚫 Symbol only appears after the boot process has already started (the bootscreen appears/verbose boot starts), it could mean that your USB drive has failed to pass macOS' integrity checks. To resolve this, create a new installer using a different USB drive (preferably of a different model.)
+
 ## Cannot boot macOS without the USB
 
-By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. Instead, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or run this patcher's Option 2 again and select your internal drive.
+By default, the OpenCore Patcher won't install OpenCore onto the internal drive itself during installs. 
+
+After installing macOS, OpenCore Legacy Patcher should automatically prompt you to install OpenCore onto the internal drive. However, if it doesn't show the prompt, you'll need to either [manually transfer](https://dortania.github.io/OpenCore-Post-Install/universal/oc2hdd.html) OpenCore to the internal drive's EFI or Build and Install again and select your internal drive.
 
 Reminder that once this is done, you'll need to select OpenCore in the boot picker again for your hardware to remember this entry and auto boot from then on.
 
@@ -55,7 +59,7 @@ With OpenCore Legacy Patcher, we rely on Apple Secure Boot to ensure OS updates
 sudo pmset -a hibernatemode 0
 ```
 
-## How to Boot Big Sur Recovery
+## How to Boot Recovery through OpenCore Legacy Patcher
 
 By default, the patcher will try to hide extra boot options such as recovery from the user. To make them appear, simply press the `Spacebar` key while inside OpenCore's Picker to list all boot options.
 
@@ -160,7 +164,7 @@ Applicable models include:
 
 | Family      | Year                 | Model                         | Notes                                            |
 | :---------- | :--------------------| :---------------------------- | :----------------------------------------------- |
-| MacBook     | Mid 2010 and older   | MacBook4,1 - MacBook7,1       |                                                  |
+| MacBook     | Mid 2010 and older   | MacBook5,1 - MacBook7,1       |                                                  |
 | MacBook Air | Late 2010 and older  | MacBookAir2,1 - MacBookAir3,x |                                                  |
 | MacBook Pro | Mid 2010 and older   | MacBookPro4,1 - MacBookPro7,x | Excludes Mid 2010 15" and 17" (MacBookPro6,x)    |
 | iMac        | Late 2009 and older  | iMac7,1 - iMac10,x            | Excludes Core i5/7 27" late 2009 iMac (iMac11,1) |

docs/UNIVERSALCONTROL.md

@@ -51,8 +51,7 @@ Note: For AirPort upgrades, only the best/newest cards are listed.
 
 |   SMBIOS   | WiFi/BT version | UC OOB  | Comment |
 |------------|-----------------|------------|---------|
-| MacBook4,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card  |
+| MacBook5,1 | Wi-Fi 4 / BT 2.0 EDR |  <span style="color:red"> NO </span> | Use a Broadcom USB Bluetooth 4.0+ Dongle </span> |
-| MacBook5,1 | ^^ |  ^^ | Use a Broadcom USB Bluetooth 4.0+ Dongle </span> |
 | MacBook5,2 | WiFi 4 / BT 2.1 EDR  | ^^ | Replace stock AirPort card with an mPCIE + USB Connector Adapter board with a BCM94360CS2 card  |
 | MacBook6,1 | ^^ | ^^ | Replace stock AirPort card with a BCM94331PCIEBT4CAX/BCM94331PCIEBT4 card |
 | MacBook7,1 | ^^ | ^^ | ^^ |

docs/VENTURA-DROP.md

@@ -127,7 +127,7 @@ The following GPUs are applicable:
 The following machines shipped stock with an unsupported GPU:
 
 * iMac7,1 - iMac12,x
-* MacBook4,1 - MacBook7,1
+* MacBook5,1 - MacBook7,1
 * MacBookAir2,1 - MacBookAir4,x
 * MacBookPro4,1 - MacBookPro8,x
 * Macmini3,1 - Macmini5,x

payloads/Config/config.plist

@@ -1581,6 +1581,42 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Aquantia Ethernet Patch - Core</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>21.4.0</string>
+				<key>BundlePath</key>
+				<string>AppleEthernetAbuantiaAqtion.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleEthernetAbuantiaAqtion</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Comment</key>
+				<string>Aquantia Ethernet Patch - Firmware</string>
+				<key>Enabled</key>
+				<false/>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>21.4.0</string>
+				<key>BundlePath</key>
+				<string>AppleEthernetAbuantiaAqtionFirmware.kext</string>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleEthernetAbuantiaAqtionFirmware</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 		</array>
 		<key>Block</key>
 		<array/>

payloads/Kexts/Plists/PlatformPlugin/MacBook4,1/MacBook4_1.plist

@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>IOPlatformThermalProfile</key>
-    <dict>
-      <key>ConfigArray</key>
-      <array>
-        <dict>
-          <key>WWEN</key>
-          <true/>
-          <key>model</key>
-          <string>MacBook4,1</string>
-        </dict>
-      </array>
-      <key>CStateDict</key>
-      <dict>
-        <key>MacBook4,1</key>
-        <string>CSD3</string>
-        <key>CSD3</key>
-        <dict>
-          <key>C6</key>
-          <dict>
-            <key>enable</key>
-            <false/>
-          </dict>
-        </dict>
-      </dict>
-      <key>ControlArray</key>
-      <array>
-        <dict>
-          <key>Desc-Key</key>
-          <string>CPU_PLIMIT</string>
-          <key>IOClass</key>
-          <string>AppleSMCControl</string>
-          <key>control-flags</key>
-          <integer>2</integer>
-          <key>control-id</key>
-          <integer>10</integer>
-          <key>location</key>
-          <string>cpu plimit</string>
-          <key>type</key>
-          <string>smc</string>
-        </dict>
-        <dict>
-          <key>Desc-Key</key>
-          <string>CPU_STATE</string>
-          <key>IOClass</key>
-          <string>AppleSMCControl</string>
-          <key>control-flags</key>
-          <integer>2</integer>
-          <key>control-id</key>
-          <integer>13</integer>
-          <key>location</key>
-          <string>cpu state</string>
-          <key>type</key>
-          <string>smc</string>
-        </dict>
-        <dict>
-          <key>Desc-Key</key>
-          <string>GPU_PLIMIT</string>
-          <key>IOClass</key>
-          <string>AppleSMCControl</string>
-          <key>control-flags</key>
-          <integer>2</integer>
-          <key>control-id</key>
-          <integer>11</integer>
-          <key>location</key>
-          <string>gpu plimit</string>
-          <key>type</key>
-          <string>smc</string>
-        </dict>
-        <dict>
-          <key>Desc-Key</key>
-          <string>GPU_STATE</string>
-          <key>IOClass</key>
-          <string>AppleSMCControl</string>
-          <key>control-flags</key>
-          <integer>2</integer>
-          <key>control-id</key>
-          <integer>14</integer>
-          <key>location</key>
-          <string>gpu state</string>
-          <key>type</key>
-          <string>smc</string>
-        </dict>
-        <dict>
-          <key>Desc-Key</key>
-          <string>MEM_PLIMIT</string>
-          <key>IOClass</key>
-          <string>AppleSMCControl</string>
-          <key>control-flags</key>
-          <integer>2</integer>
-          <key>control-id</key>
-          <integer>12</integer>
-          <key>location</key>
-          <string>mem plimit</string>
-          <key>type</key>
-          <string>smc</string>
-        </dict>
-      </array>
-      <key>CreationDate</key>
-      <string>Tue May 26 15:26:07 PDT 2009</string>
-      <key>CtrlLoopArray</key>
-      <array>
-        <dict>
-          <key>Description</key>
-          <string>SMC_CPU_Control_Loop</string>
-          <key>IOClass</key>
-          <string>ACPI_SMC_CtrlLoop</string>
-          <key>PLimitClass</key>
-          <array>
-            <string>CPU</string>
-          </array>
-          <key>MetaStateArray</key>
-          <array>
-            <dict>
-              <key>Description</key>
-              <string>Normal</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>Reduced Power</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>User Low Power</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>User High Power</string>
-            </dict>
-          </array>
-          <key>StepDataDict</key>
-          <dict>
-            <key>MacBook4,1</key>
-            <string>SP1</string>
-            <key>SP1</key>
-            <data>
-xgYAAAAAAQIEAAACAgAAVQBuAHMAcABlAGMAaQBmAGkAZQBkDAAH/wcAACEAAAACAAAB//8A/wD/
-AP8A/wD/AAYAAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wAL
-DwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD
-/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/
-AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsP
-AAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/
-AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8B
-AAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8A
-AP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8A
-Cw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEA
-A/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA
-/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wALDwAA/wEAA/8ACw8AAP8BAAP/AAsPAAD/AQAD/wAL
-DwAA/wEAA/8ACw8AAP8BAAP/AAsKAAABCgAAAQAAAAEAAAD1AAEFAAABAAAF/wABAAAAAQAAAAEG
-AAACAAAABAEAAIAAwwC3AC4ANAALAAAAAgAAAAEAAAABAAAAAgAAAAICAAACBgAAAQAAAAEAAAD1
-AAEFAAADAAAF/wADAgAAAwYAAAkAAAAEAAAATAAEBQAABAAABf8AAwAAAAEAAAAEBAAAgAAAAAoK
-AAAIAAAABQAAAAgAAAAFAAAAAwAAAAIAAAAFBgAABwAAAAEAAAD1AAEFAAAGAAAF/wADAAAAAwAA
-AAYGAAACAAAABAAAAKAADwUAAAcEAAAHAAAAAwAAAAQAAAAHBgAACAoAAAMAAAX/AAQCAAAIBgAA
-AQAAAAEAAADoAAMFAAAJAAAF/wAFAgAACQYAAAIAAAAEAAAA6AADBQAADQAAAAoAAAANAAAACgAA
-AAUAAAABAAAACgYAAAcAAAABAAAA9QABBQAACwAABf8ABQAAAAIAAAALBgAAAgAAAAQAAACgAA8F
-AAAMBAAADAAAAAUAAAADAAAADAYAAAgKAAAJAAAF/wAGAgAADQYAAAEAAAABAAAA6AADBQAADgAA
-Bf8ABwIAAA4GAAACAAAABAAAAFgAGwUAABIAAAAPAAAAEgAAAA8AAAAHAAAAAQAAAA8GAAAHAAAA
-AQAAAPUAAQUAABAAAAX/AAcAAAACAAAAEAYAAAIAAAAEAAAAoAAPBQAAEQQAABEAAAAHAAAAAwAA
-ABEGAAAICgAADgAABf8ACAIAABIGAAABAAAAAQAAAOgAAwUAABMAAAX/AAkCAAATBgAAAgAAAAQA
-AAD8AAgFAAAXAAAAFAAAABcAAAAUAAAACQAAAAEAAAAUBgAABwAAAAEAAAD1AAEFAAAVAAAF/wAJ
-AAAAAgAAABUGAAACAAAABAAAAKAADwUAABYEAAAWAAAACQAAAAMAAAAWBgAACAoAABMAAAX/AAoC
-AAAXBgAAAQAAAAEAAADoAAMFAAAYAAAF/wALAgAAGAYAAAIAAAAEAAAAKAAKBQAAHAAAABkAAAAc
-AAAAGQAAAAsAAAABAAAAGQYAAAcAAAABAAAA9QABBQAAGgAABf8ACwAAAAIAAAAaBgAAAgAAAAQA
-AACgAA8FAAAbBAAAGwAAAAsAAAADAAAAGwYAAAgKAAAYAAAF/wAMAgAAHAYAAAEAAAABAAAA9AAB
-BQAAHQAABf8ADQIAAB0GAAACAAAABAEAAIAAwwC3AC4ANAALAAAAHQAAAB4AAAAdAAAAHgAAAA0A
-AAABAAAAHgYAAAcAAAABAAAA9QABBQAAHwAABf8ADQAAAAIAAAAfBgAAAgAAAAQAAACgAA8FAAAg
-BAAAIAAAAA0AAAADAAAAIAYAAAgKAAAdAAAF/w==
-</data>
-          </dict>
-          <key>ctrlloop-id</key>
-          <integer>0</integer>
-          <key>is-state-driven</key>
-          <integer>1</integer>
-        </dict>
-        <dict>
-          <key>Description</key>
-          <string>SMC_GPU_sensor_Control_Loop</string>
-          <key>GPUPowerMgmtFloorArray</key>
-          <array>
-            <integer>1</integer>
-          </array>
-          <key>GPUThresholdDict</key>
-          <dict>
-            <key>MacBook4,1</key>
-            <string>TA3</string>
-            <key>TA3</key>
-            <array>
-              <dict>
-                <key>high-threshold</key>
-                <integer>25</integer>
-                <key>low-threshold</key>
-                <integer>0</integer>
-              </dict>
-              <dict>
-                <key>high-threshold</key>
-                <integer>33</integer>
-                <key>low-threshold</key>
-                <integer>25</integer>
-              </dict>
-              <dict>
-                <key>high-threshold</key>
-                <integer>99</integer>
-                <key>low-threshold</key>
-                <integer>33</integer>
-              </dict>
-              <dict>
-                <key>high-threshold</key>
-                <integer>100</integer>
-                <key>low-threshold</key>
-                <integer>99</integer>
-              </dict>
-            </array>
-          </dict>
-          <key>IOClass</key>
-          <string>ACPI_SMC_CtrlLoop</string>
-          <key>PLimitClass</key>
-          <array>
-            <string>GPU</string>
-          </array>
-          <key>MetaStateArray</key>
-          <array>
-            <dict>
-              <key>Description</key>
-              <string>Normal</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>Reduced Power</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>User Low Power</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>User High Power</string>
-            </dict>
-          </array>
-          <key>SensorIDArray</key>
-          <array>
-            <integer>6</integer>
-          </array>
-          <key>ctrlloop-id</key>
-          <integer>1</integer>
-          <key>is-state-driven</key>
-          <integer>1</integer>
-        </dict>
-        <dict>
-          <key>Description</key>
-          <string>SMC_Memory_Control_Loop</string>
-          <key>IOClass</key>
-          <string>ACPI_SMC_CtrlLoop</string>
-          <key>PLimitClass</key>
-          <array>
-            <string>Mem</string>
-          </array>
-          <key>MCHThrottleDict</key>
-          <dict>
-            <key>MacBook4,1</key>
-            <string>MT3</string>
-            <key>MT3</key>
-            <array>
-              <dict>
-                <key>DTC_WAB</key>
-                <integer>32</integer>
-                <key>DTC_WAT</key>
-                <integer>0</integer>
-                <key>GTC_WAB</key>
-                <integer>0</integer>
-                <key>GTC_WAT</key>
-                <integer>15</integer>
-              </dict>
-              <dict>
-                <key>DTC_WAB</key>
-                <integer>32</integer>
-                <key>DTC_WAT</key>
-                <integer>0</integer>
-                <key>GTC_WAB</key>
-                <integer>0</integer>
-                <key>GTC_WAT</key>
-                <integer>15</integer>
-              </dict>
-              <dict>
-                <key>DTC_WAB</key>
-                <integer>32</integer>
-                <key>DTC_WAT</key>
-                <integer>0</integer>
-                <key>GTC_WAB</key>
-                <integer>0</integer>
-                <key>GTC_WAT</key>
-                <integer>15</integer>
-              </dict>
-              <dict>
-                <key>DTC_WAB</key>
-                <integer>32</integer>
-                <key>DTC_WAT</key>
-                <integer>0</integer>
-                <key>GTC_WAB</key>
-                <integer>0</integer>
-                <key>GTC_WAT</key>
-                <integer>15</integer>
-              </dict>
-            </array>
-          </dict>
-          <key>MetaStateArray</key>
-          <array>
-            <dict>
-              <key>Description</key>
-              <string>Normal</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>Reduced Power</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>User Low Power</string>
-            </dict>
-            <dict>
-              <key>Description</key>
-              <string>User High Power</string>
-            </dict>
-          </array>
-          <key>ctrlloop-id</key>
-          <integer>2</integer>
-          <key>is-state-driven</key>
-          <integer>1</integer>
-        </dict>
-      </array>
-      <key>SensorArray</key>
-      <array>
-        <dict>
-          <key>Desc-Key</key>
-          <string>GPU</string>
-          <key>IOClass</key>
-          <string>IOPlatformSensor</string>
-          <key>sensor-id</key>
-          <integer>6</integer>
-        </dict>
-      </array>
-    </dict>
-  </dict>
-</plist>

resources/build/misc.py

@@ -210,7 +210,7 @@ class BuildMiscellaneous:
                         support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleUSBMultitouch.kext", self.constants.multitouch_version, self.constants.multitouch_path)
 
             # Two-finger Top Case support for macOS High Sierra+
-            if self.model in ["MacBook4,1", "MacBook5,2"]:
+            if self.model == "MacBook5,2":
                 support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleUSBTrackpad.kext", self.constants.apple_trackpad, self.constants.apple_trackpad_path) # Also requires AppleUSBTopCase.kext
                 support.BuildSupport(self.model, self.constants, self.config).enable_kext("LegacyKeyboardInjector.kext", self.constants.legacy_keyboard, self.constants.legacy_keyboard_path) # Inject legacy personalities into AppleUSBTCKeyboard and AppleUSBTCKeyEventDriver
 

resources/build/networking/wired.py

@@ -63,6 +63,14 @@ class BuildWiredNetworking:
                 support.BuildSupport(self.model, self.constants, self.config).enable_kext("nForceEthernet.kext", self.constants.nforce_version, self.constants.nforce_path)
             elif isinstance(controller, device_probe.Marvell) or isinstance(controller, device_probe.SysKonnect):
                 support.BuildSupport(self.model, self.constants, self.config).enable_kext("MarvelYukonEthernet.kext", self.constants.marvel_version, self.constants.marvel_path)
+            
+            # Pre-Ivy Bridge Aquantia Ethernet Patch
+            if isinstance(controller, device_probe.Aquantia) and controller.chipset == device_probe.Aquantia.Chipsets.AppleEthernetAquantiaAqtion:
+                if not self.model in smbios_data.smbios_dictionary:
+                    continue
+                if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.CPUGen.ivy_bridge.value:
+                    support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleEthernetAbuantiaAqtion.kext", self.constants.aquantia_version, self.constants.aquantia_path)
+                    support.BuildSupport(self.model, self.constants, self.config).enable_kext("AppleEthernetAbuantiaAqtionFirmware.kext", self.constants.aquantiafirmware_version, self.constants.aquantiafirmware_path)
 
 
     def _prebuilt_assumption(self) -> None:

resources/constants.py

@@ -73,6 +73,10 @@ class Constants:
         self.bigsursdxc_version:       str = "1.0.0"  # BigSurSDXC
         self.monterey_ahci_version:    str = "1.0.0"  # CatalinaAHCI
 
+        ## Apple - Jazzzny Modified
+        self.aquantia_version: str = "1.0.0"  # AppleEthernetAbuantiaAqtion
+        self.aquantiafirmware_version: str = "1.0.0"  # AppleEthernetAbuantiaAqtionFirmware
+
         ## Dortania
         ## https://github.com/dortania
         self.backlight_injector_version:  str = "1.1.0"  # BacklightInjector
@@ -341,6 +345,14 @@ class Constants:
     @property
     def bcm570_path(self):
         return self.payload_kexts_path / Path(f"Ethernet/CatalinaBCM5701Ethernet-v{self.bcm570_version}.zip")
+    
+    @property
+    def aquantia_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/AppleEthernetAbuantiaAqtion-v{self.aquantia_version}.zip")
+
+    @property
+    def aquantiafirmware_path(self):
+        return self.payload_kexts_path / Path(f"Ethernet/AppleEthernetAbuantiaAqtionFirmware-v{self.aquantiafirmware_version}.zip")
 
     @property
     def i210_path(self):

resources/wx_gui/gui_settings.py

@@ -1022,7 +1022,7 @@ Hardware Information:
                 if self.constants.computer.real_model in smbios_data.smbios_dictionary:
                     if self.constants.detected_os > smbios_data.smbios_dictionary[self.constants.computer.real_model]["Max OS Supported"]:
                         chassis_type = "aluminum"
-                        if self.constants.computer.real_model in ["MacBook4,1", "MacBook5,2", "MacBook6,1", "MacBook7,1"]:
+                        if self.constants.computer.real_model in ["MacBook5,2", "MacBook6,1", "MacBook7,1"]:
                             chassis_type = "plastic"
                         dlg = wx.MessageDialog(self.frame_modal, f"This model, {self.constants.computer.real_model}, does not natively support macOS {os_data.os_conversion.kernel_to_os(self.constants.detected_os)}, {os_data.os_conversion.convert_kernel_to_marketing_name(self.constants.detected_os)}. The last native OS was macOS {os_data.os_conversion.kernel_to_os(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}, {os_data.os_conversion.convert_kernel_to_marketing_name(smbios_data.smbios_dictionary[self.constants.computer.real_model]['Max OS Supported'])}\n\nToggling this option will break booting on this OS. Are you absolutely certain this is desired?\n\nYou may end up with a nice {chassis_type} brick 🧱", "Are you certain?", wx.YES_NO | wx.ICON_WARNING | wx.NO_DEFAULT)
                         if dlg.ShowModal() == wx.ID_NO: