Remove MacBook4,1 SMBIOS (#1080)

This commit is contained in:
Jazzzny
2023-07-11 14:08:50 -04:00
committed by GitHub
parent d60dd4c9df
commit 4e4ebe25e7
11 changed files with 10 additions and 400 deletions

View File

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

View File

@@ -11,6 +11,8 @@
- 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
- Backend Changes:
- device_probe.py:
- Add USB device parsing via `IOUSBDevice` class

View File

@@ -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",

View File

@@ -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
:::

View File

@@ -164,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) |

View File

@@ -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 | ^^ | ^^ | Use a Broadcom USB Bluetooth 4.0+ Dongle </span> |
| 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,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 | ^^ | ^^ | ^^ |

View File

@@ -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

File diff suppressed because one or more lines are too long

View File

@@ -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>

View File

@@ -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

View File

@@ -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: