From a5fcc35d3ce0e4f60a6674d3b4f9f3c1fa2e38a9 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Mon, 9 Aug 2021 09:19:48 -0600 Subject: [PATCH] Add MacPro4,1 data set --- OCLP-CLI.command | 2 ++ Resources/ModelExample.py | 42 ++++++++++++++++++++++++++++++++++++ payloads/Config/config.plist | 4 ++-- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/OCLP-CLI.command b/OCLP-CLI.command index 927467c57..5ef12143e 100755 --- a/OCLP-CLI.command +++ b/OCLP-CLI.command @@ -254,6 +254,8 @@ If you plan to create the USB for another machine, please select the "Change Mod ModelExample.MacPro.MacPro31_Upgrade, ModelExample.MacPro.MacPro31_Modern_AMD, ModelExample.MacPro.MacPro31_Modern_Kepler, + ModelExample.MacPro.MacPro41_Upgrade, + ModelExample.MacPro.MacPro41_Modern_AMD, ] self.constants.validate = True diff --git a/Resources/ModelExample.py b/Resources/ModelExample.py index 8638c7a8f..fa7a8bedc 100644 --- a/Resources/ModelExample.py +++ b/Resources/ModelExample.py @@ -276,3 +276,45 @@ class MacPro: oclp_version=None, opencore_version=None, ) + + MacPro41_Upgrade = device_probe.Computer( + # Upgraded model with AMD HD7950, Atheros PCIe card + real_model="MacPro4,1", + real_board_id="Mac-F221BEC8", + reported_model="MacPro4,1", + reported_board_id="Mac-F221BEC8", + gpus=[device_probe.AMD(vendor_id=4098, device_id=26522, class_code=196608, name="PXS1", model="AMD Radeon HD 7950", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)")], + igpu=None, + dgpu=None, + storage=[device_probe.SATAController(vendor_id=32902, device_id=14882, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)")], + wifi=device_probe.Atheros(vendor_id=5772, device_id=48, class_code=163840, name="PXS4", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x4,0x0)/Pci(0x0,0x0)"), + cpu=device_probe.CPU( + name="Intel(R) Xeon(R) CPU W3520 @ 2.67GHz", + flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT"] + ), + oclp_version=None, + opencore_version=None + ) + + MacPro41_Modern_AMD = device_probe.Computer( + # Upgraded model with AMD RX470, BCM94360CD + # Booted through OpenCore + real_model="MacPro4,1", + real_board_id="Mac-F221BEC8", + reported_model="MacPro4,1", + reported_board_id="Mac-27AD2F918AE68F61", + gpus=[device_probe.AMD(vendor_id=4098, device_id=26591, class_code=196608, name="GFX0", model="Radeon RX 470/570", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)")], + igpu=None, + dgpu=device_probe.AMD(vendor_id=4098, device_id=26591, class_code=196608, name="GFX0", model="Radeon RX 470/570", pci_path="PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)"), + storage=[ + device_probe.SATAController(vendor_id=32902, device_id=14882, class_code=67073, name="SATA", model=None, pci_path="PciRoot(0x0)/Pci(0x1f,0x2)"), + device_probe.NVMeController(vendor_id=32902, device_id=61864, class_code=67586, name="PXS3", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)", aspm=2) + ], + wifi=device_probe.Broadcom(vendor_id=5348, device_id=17312, class_code=163840, name="ARPT", model=None, pci_path="PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)/Pci(0x4,0x0)/Pci(0x0,0x0)"), + cpu=device_probe.CPU( + name="Intel(R) Xeon(R) CPU W3520 @ 2.67GHz", + flags=["FPU", "VME", "DE", "PSE", "TSC", "MSR", "PAE", "MCE", "CX8", "APIC", "SEP", "MTRR", "PGE", "MCA", "CMOV", "PAT", "PSE36", "CLFSH", "DS", "ACPI", "MMX", "FXSR", "SSE", "SSE2", "SS", "HTT", "TM", "PBE", "SSE3", "DTES64", "MON", "DSCPL", "VMX", "EST", "TM2", "SSSE3", "CX16", "TPR", "PDCM", "SSE4.1", "SSE4.2", "POPCNT"] + ), + oclp_version="0.2.5", + opencore_version="REL-071-2021-07-02" + ) \ No newline at end of file diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist index 30a172977..43143528d 100644 --- a/payloads/Config/config.plist +++ b/payloads/Config/config.plist @@ -1648,9 +1648,9 @@ JumpstartHotPlug MinDate - 0 + 20180621 MinVersion - 0 + 748077008000000 AppleInput