diff --git a/Data/smbios_data.py b/Data/smbios_data.py index ae051de50..5b212f1aa 100644 --- a/Data/smbios_data.py +++ b/Data/smbios_data.py @@ -14,7 +14,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 13, "UGA Graphics": True, - + "Ethernet Chipset": "Marvell", }, "MacBook2,1": { @@ -27,6 +27,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 13, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBook3,1": { @@ -39,6 +40,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 13, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBook4,1": { @@ -51,6 +53,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, @@ -63,6 +66,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -75,6 +80,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -87,6 +94,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 13, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -99,6 +108,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 13, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -111,6 +122,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, + "Ethernet Chipset": None, }, "MacBook9,1": { @@ -122,6 +134,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, + "Ethernet Chipset": None, }, "MacBook10,1": { @@ -133,6 +146,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 12, + "Ethernet Chipset": None, }, @@ -145,6 +159,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookAir2,1": { @@ -156,6 +171,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "nForce Chipset": True, + "Ethernet Chipset": None, }, @@ -168,6 +185,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 11, + "nForce Chipset": True, + "Ethernet Chipset": None, }, @@ -180,6 +199,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "nForce Chipset": True, + "Ethernet Chipset": None, }, @@ -192,6 +213,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 11, + "Ethernet Chipset": "Broadcom", # Set for Apple Thunderbolt Adapter }, @@ -204,6 +226,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 13, + "Ethernet Chipset": "Broadcom", # Set for Apple Thunderbolt Adapter }, @@ -216,6 +239,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 11, + "Ethernet Chipset": None, }, @@ -228,6 +252,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 13, + "Ethernet Chipset": None, }, @@ -240,6 +265,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 11, + "Ethernet Chipset": None, }, @@ -252,6 +278,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookAir7,1": { @@ -263,6 +290,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 11, + "Ethernet Chipset": None, }, "MacBookAir7,2": { @@ -274,6 +302,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookAir8,1": { @@ -285,6 +314,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookAir8,2": { @@ -296,6 +326,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookAir9,1": { @@ -307,6 +338,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro1,1": { @@ -319,6 +351,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 15, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBookPro1,2": { @@ -331,6 +364,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 17, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBookPro2,1": { @@ -343,6 +377,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 17, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBookPro2,2": { @@ -355,6 +390,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 15, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBookPro3,1": { @@ -367,6 +403,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "Screen Size": 15, # Shipped with 17 as well "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "MacBookPro4,1": { @@ -380,6 +417,7 @@ smbios_dictionary = { "Screen Size": 15, # Shipped with 17 as well "Switchable GPUs": True, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, @@ -393,6 +431,8 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -406,6 +446,8 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 17, "Switchable GPUs": True, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -419,6 +461,8 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -432,6 +476,8 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -444,6 +490,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -457,6 +505,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 17, "Switchable GPUs": True, + "Ethernet Chipset": "Broadcom", }, @@ -470,6 +519,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": "Broadcom", }, @@ -482,6 +532,8 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "Screen Size": 13, + "Ethernet Chipset": "Broadcom", + "nForce Chipset": True, }, @@ -494,6 +546,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 13, + "Ethernet Chipset": "Broadcom", }, @@ -507,6 +560,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": "Broadcom", }, @@ -520,6 +574,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, "Screen Size": 17, "Switchable GPUs": True, + "Ethernet Chipset": "Broadcom", }, @@ -533,6 +588,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": "Broadcom", }, @@ -545,6 +601,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 13, + "Ethernet Chipset": "Broadcom", }, @@ -558,6 +615,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, @@ -570,6 +628,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, "Screen Size": 13, + "Ethernet Chipset": None, }, @@ -582,6 +641,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, + "Ethernet Chipset": None, }, @@ -594,6 +654,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, + "Ethernet Chipset": None, }, @@ -607,6 +668,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro11,4": { @@ -618,6 +680,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, + "Ethernet Chipset": None, }, "MacBookPro11,5": { @@ -630,6 +693,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro12,1": { @@ -641,6 +705,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro13,1": { @@ -652,6 +717,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro13,2": { @@ -663,6 +729,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro13,3": { @@ -675,6 +742,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro14,1": { @@ -686,6 +754,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro14,2": { @@ -697,6 +766,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro14,3": { @@ -709,6 +779,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703_UART, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro15,1": { @@ -721,6 +792,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro15,2": { @@ -732,6 +804,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro15,3": { @@ -744,6 +817,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 15, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro15,4": { @@ -755,6 +829,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro16,1": { @@ -767,6 +842,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 16, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "MacBookPro16,2": { @@ -778,6 +854,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro16,3": { @@ -789,6 +866,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 13, + "Ethernet Chipset": None, }, "MacBookPro16,4": { @@ -801,6 +879,7 @@ smbios_dictionary = { "Bluetooth Model": bluetooth_data.bluetooth_data.UART, "Screen Size": 16, "Switchable GPUs": True, + "Ethernet Chipset": None, }, "Macmini1,1": { @@ -811,6 +890,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.snow_leopard, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, + "Ethernet Chipset": "Marvell", }, "Macmini2,1": { @@ -821,6 +901,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.lion, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, + "Ethernet Chipset": "Marvell", }, "Macmini3,1": { @@ -831,6 +912,8 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -842,6 +925,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, + "Ethernet Chipset": "Broadcom", }, @@ -853,6 +937,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, + "Ethernet Chipset": "Broadcom", }, @@ -864,6 +949,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, + "Ethernet Chipset": "Broadcom", }, @@ -875,6 +961,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2070, + "Ethernet Chipset": "Broadcom", }, @@ -886,6 +973,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, + "Ethernet Chipset": "Broadcom", }, @@ -897,6 +985,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, + "Ethernet Chipset": "Broadcom", }, "Macmini7,1": { @@ -907,6 +996,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, "Macmini8,1": { @@ -917,6 +1007,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "iMac4,1": { @@ -928,6 +1019,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "iMac4,2": { @@ -939,6 +1031,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "iMac5,1": { @@ -950,6 +1043,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "iMac5,2": { @@ -961,6 +1055,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "iMac6,1": { @@ -972,6 +1067,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, "iMac7,1": { @@ -983,6 +1079,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, @@ -995,6 +1092,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, "UGA Graphics": True, + "Ethernet Chipset": "Marvell", }, @@ -1006,6 +1104,8 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -1018,6 +1118,8 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Nvidia", + "nForce Chipset": True, }, @@ -1029,6 +1131,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Broadcom", }, @@ -1040,6 +1143,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Broadcom", }, @@ -1051,6 +1155,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Broadcom", }, @@ -1062,6 +1167,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Broadcom", }, @@ -1073,6 +1179,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.high_sierra, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Broadcom", }, @@ -1084,6 +1191,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, + "Ethernet Chipset": "Broadcom", }, @@ -1095,6 +1203,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, + "Ethernet Chipset": "Broadcom", }, @@ -1106,6 +1215,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4360, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v1, + "Ethernet Chipset": "Broadcom", }, @@ -1117,6 +1227,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, @@ -1128,6 +1239,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, @@ -1139,6 +1251,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.catalina, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, @@ -1150,6 +1263,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, @@ -1161,6 +1275,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.big_sur, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, "iMac16,1": { @@ -1171,6 +1286,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, "iMac16,2": { @@ -1181,6 +1297,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, "iMac17,1": { @@ -1193,6 +1310,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, "iMac18,1": { @@ -1203,6 +1321,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, + "Ethernet Chipset": "Broadcom", }, "iMac18,2": { @@ -1213,6 +1332,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, + "Ethernet Chipset": "Broadcom", }, "iMac18,3": { @@ -1223,6 +1343,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20703, + "Ethernet Chipset": "Broadcom", }, "iMac19,1": { @@ -1233,6 +1354,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "iMac19,2": { @@ -1243,6 +1365,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "iMac20,1": { @@ -1253,6 +1376,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "iMac20,2": { @@ -1263,6 +1387,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "iMacPro1,1": { @@ -1273,6 +1398,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "MacPro1,1": { @@ -1284,6 +1410,7 @@ smbios_dictionary = { "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, + "Ethernet Chipset": "Intel 80003ES2LAN", }, "MacPro2,1": { @@ -1295,6 +1422,7 @@ smbios_dictionary = { "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, + "Ethernet Chipset": "Intel 80003ES2LAN", }, "MacPro3,1": { @@ -1306,6 +1434,7 @@ smbios_dictionary = { "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm43224, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2045, "UGA Graphics": True, + "Ethernet Chipset": "Intel 80003ES2LAN", }, @@ -1317,6 +1446,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": device_probe.Atheros.Chipsets.AirPortAtheros40, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Intel 82574L", }, @@ -1328,6 +1458,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.mojave, "Wireless Model": device_probe.Broadcom.Chipsets.AirPortBrcm4331, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM2046, + "Ethernet Chipset": "Intel 82574L", }, "MacPro6,1": { @@ -1338,6 +1469,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AirportBrcmNIC, "Bluetooth Model": bluetooth_data.bluetooth_data.BRCM20702_v2, + "Ethernet Chipset": "Broadcom", }, "MacPro7,1": { @@ -1348,6 +1480,7 @@ smbios_dictionary = { "Max OS Supported": None, "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe, "Bluetooth Model": bluetooth_data.bluetooth_data.UART, + "Ethernet Chipset": "Broadcom", }, "Xserve1,1": { @@ -1359,6 +1492,7 @@ smbios_dictionary = { "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, "UGA Graphics": True, + "Ethernet Chipset": "Intel 80003ES2LAN", }, "Xserve2,1": { @@ -1370,6 +1504,7 @@ smbios_dictionary = { "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, "UGA Graphics": True, + "Ethernet Chipset": "Intel 80003ES2LAN", }, "Xserve3,1": { @@ -1380,6 +1515,7 @@ smbios_dictionary = { "Max OS Supported": os_data.os_data.el_capitan, "Wireless Model": None, "Bluetooth Model": bluetooth_data.bluetooth_data.NonApplicable, + "Ethernet Chipset": "Intel 82574L", }, } diff --git a/OpenCore-Patcher.command b/OpenCore-Patcher.command index a27fe900c..626766007 100755 --- a/OpenCore-Patcher.command +++ b/OpenCore-Patcher.command @@ -8,7 +8,7 @@ import subprocess import sys from Resources import Build, CliMenu, Constants, ModelArray, SysPatch, Utilities, device_probe - +from Data import smbios_data, cpu_data class OpenCoreLegacyPatcher: def __init__(self): @@ -166,7 +166,7 @@ system_profiler SPHardwareDataType | grep 'Model Identifier' [ [f"Set SurPlus Settings:\tCurrently {self.constants.force_surplus}", CliMenu.MenuOptions(self.constants.custom_model or self.computer.real_model, self.constants).set_surplus] ] - if ((self.constants.custom_model or self.computer.real_model) in ModelArray.PCIRaceCondition) + if (smbios_data.smbios_dictionary[self.constants.custom_model or self.computer.real_model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge) else [] ) diff --git a/Resources/Build.py b/Resources/Build.py index 62ff20957..a04f0ea4f 100644 --- a/Resources/Build.py +++ b/Resources/Build.py @@ -15,7 +15,7 @@ from pathlib import Path from datetime import date from Resources import Constants, ModelArray, Utilities, device_probe, generate_smbios -from Data import smbios_data, bluetooth_data, cpu_data +from Data import smbios_data, bluetooth_data, cpu_data, os_data def rmtree_handler(func, path, exc_info): @@ -104,7 +104,7 @@ class BuildOpenCore: ("RestrictEvents.kext", self.constants.restrictevents_mbp_version, self.constants.restrictevents_mbp_path, lambda: self.model in ["MacBookPro6,1", "MacBookPro6,2", "MacBookPro9,1"]), ("SMC-Spoof.kext", self.constants.smcspoof_version, self.constants.smcspoof_path, lambda: self.constants.allow_oc_everywhere is False), # CPU patches - ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: self.model in ModelArray.DualSocket), + ("AppleMCEReporterDisabler.kext", self.constants.mce_version, self.constants.mce_path, lambda: self.model.startswith("MacPro") or self.model.startswith("Xserve")), ("AAAMouSSE.kext", self.constants.mousse_version, self.constants.mousse_path, lambda: smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.penryn), ("telemetrap.kext", self.constants.telemetrap_version, self.constants.telemetrap_path, lambda: smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.penryn), ( @@ -114,9 +114,8 @@ class BuildOpenCore: lambda: self.model not in ["iMac7,1", "Xserve2,1", "Dortania1,1"] and self.constants.allow_oc_everywhere is False and self.constants.disallow_cpufriend is False, ), # Ethernet patches - ("nForceEthernet.kext", self.constants.nforce_version, self.constants.nforce_path, lambda: self.model in ModelArray.EthernetNvidia), - ("MarvelYukonEthernet.kext", self.constants.marvel_version, self.constants.marvel_path, lambda: self.model in ModelArray.EthernetMarvell), - ("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path, lambda: self.model in ModelArray.EthernetBroadcom), + ("nForceEthernet.kext", self.constants.nforce_version, self.constants.nforce_path, lambda: smbios_data.smbios_dictionary[self.model]["Ethernet Chipset"] == "Marvel"), + ("MarvelYukonEthernet.kext", self.constants.marvel_version, self.constants.marvel_path, lambda: smbios_data.smbios_dictionary[self.model]["Ethernet Chipset"] == "Nvidia"), # Legacy audio ("AppleALC.kext", self.constants.applealc_version, self.constants.applealc_path, lambda: (self.model in ModelArray.LegacyAudio or self.model in ModelArray.MacPro) and self.constants.set_alc_usage is True), # IDE patch @@ -131,6 +130,13 @@ class BuildOpenCore: if self.constants.allow_oc_everywhere is False: self.get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.driver.AppleSMC")["Enabled"] = True + # Ethernet Patch Sets + if smbios_data.smbios_dictionary[self.model]["Ethernet Chipset"] == "Broadcom": + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.ivy_bridge: + # Required due to Big Sur's BCM5701 requiring VT-x support + # Applicable for pre-Ivy Bridge models + self.enable_kext("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path) + if self.constants.allow_oc_everywhere is False: if (smbios_data.smbios_dictionary[generate_smbios.set_smbios_model_spoof(self.model) or self.constants.override_smbios]["SecureBootModel"]) != None: # Monterey T2 SMBIOS don't get OS updates without a T2 SBM @@ -196,19 +202,21 @@ class BuildOpenCore: arpt_path = self.computer.wifi.pci_path print(f"- Found ARPT device at {arpt_path}") else: - if self.model in ModelArray.nvidiaHDEF: + try: + smbios_data.smbios_dictionary[self.model]["nForce Chipset"] # Nvidia chipsets all have the same path to ARPT arpt_path = "PciRoot(0x0)/Pci(0x15,0x0)/Pci(0x0,0x0)" - elif self.model in ("iMac7,1", "iMac8,1", "MacPro3,1", "MacBookPro4,1"): - arpt_path = "PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)" - elif self.model in ("iMac13,1", "iMac13,2"): - arpt_path = "PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)" - elif self.model in ("MacPro4,1", "MacPro5,1"): - arpt_path = "PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)" - else: - # Assumes we have a laptop with Intel chipset - # iMac11,x-12,x also apply - arpt_path = "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)" + except KeyError: + if self.model in ("iMac7,1", "iMac8,1", "MacPro3,1", "MacBookPro4,1"): + arpt_path = "PciRoot(0x0)/Pci(0x1C,0x4)/Pci(0x0,0x0)" + elif self.model in ("iMac13,1", "iMac13,2"): + arpt_path = "PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0)" + elif self.model in ("MacPro4,1", "MacPro5,1"): + arpt_path = "PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0)" + else: + # Assumes we have a laptop with Intel chipset + # iMac11,x-12,x also apply + arpt_path = "PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)" print(f"- Using known DevicePath {arpt_path}") # self.config["DeviceProperties"]["Add"][arpt_path] = {"device-id": binascii.unhexlify("ba430000"), "compatible": "pci14e4,43ba"} if not self.constants.custom_model and self.computer.wifi and self.constants.validate is False and self.computer.wifi.country_code: @@ -338,7 +346,6 @@ class BuildOpenCore: elif self.model == "MacBookPro10,1": self.config["DeviceProperties"]["Add"]["PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)"] = {"agdpmod": "vit9696"} - if self.model not in ModelArray.NoAGPMSupport: print("- Adding AppleGraphicsPowerManagement Override") agpm_map_path = Path(self.constants.plist_folder_path) / Path("AppleGraphicsPowerManagement/Info.plist") @@ -378,26 +385,50 @@ class BuildOpenCore: self.config["DeviceProperties"]["Add"][self.gfx0_path] = {"agdpmod": "vit9696"} # Audio Patch - if self.model in ModelArray.LegacyAudio: - print("- Adding audio properties") - hdef_path = "PciRoot(0x0)/Pci(0x8,0x0)" if self.model in ModelArray.nvidiaHDEF else "PciRoot(0x0)/Pci(0x1b,0x0)" - # In AppleALC, MacPro3,1's original layout is already in use, forcing layout 13 instead - if self.model == "MacPro3,1": - self.config["DeviceProperties"]["Add"][hdef_path] = { - "apple-layout-id": 90, - "use-apple-layout-id": 1, - "alc-layout-id": 13, - } - else: - self.config["DeviceProperties"]["Add"][hdef_path] = { - "apple-layout-id": 90, - "use-apple-layout-id": 1, - "use-layout-id": 1, - } + if self.constants.set_alc_usage is True: + if smbios_data.smbios_dictionary[self.model]["Max OS Supported"] <= os_data.os_data.high_sierra: + # Models dropped in Mojave also lost Audio support + # Xserves and MacPro4,1 are exceptions + # iMac7,1 and iMac8,1 require AppleHDA/IOAudioFamily downgrade + if not (self.model.startswith("Xserve") or self.model == "MacPro4,1"): + try: + smbios_data.smbios_dictionary[self.model]["nForce Chipset"] + hdef_path = "PciRoot(0x0)/Pci(0x8,0x0)" + except KeyError: + hdef_path = "PciRoot(0x0)/Pci(0x1b,0x0)" + # In AppleALC, MacPro3,1's original layout is already in use, forcing layout 13 instead + if self.model == "MacPro3,1": + self.config["DeviceProperties"]["Add"][hdef_path] = { + "apple-layout-id": 90, + "use-apple-layout-id": 1, + "alc-layout-id": 13, + } + else: + self.config["DeviceProperties"]["Add"][hdef_path] = { + "apple-layout-id": 90, + "use-apple-layout-id": 1, + "use-layout-id": 1, + } + self.enable_kext("AppleALC.kext", self.constants.applealc_version, self.constants.applealc_path) + elif self.model.startswith("MacPro") or self.model.startswith("Xserve"): + # Used to enable Audio support for non-standard dGPUs + self.enable_kext("AppleALC.kext", self.constants.applealc_version, self.constants.applealc_path) - # Enable FireWire Boot Support - # Applicable for both native FireWire and Thunderbolt to FireWire adapters - if self.constants.firewire_boot is True and self.model not in ModelArray.NoFireWireSupport: + + def check_firewire(model): + # MacBooks never supported FireWire + # Pre-Thunderbolt MacBook Airs as well + if model.startswith("MacBook"): + return False + elif model.startswith("MacBookAir"): + if smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge: + return False + else: + return True + + if self.constants.firewire_boot is True and check_firewire() is True: + # Enable FireWire Boot Support + # Applicable for both native FireWire and Thunderbolt to FireWire adapters print("- Enabling FireWire Boot Support") self.enable_kext("IOFireWireFamily.kext", self.constants.fw_kext, self.constants.fw_family_path) self.enable_kext("IOFireWireSBP2.kext", self.constants.fw_kext, self.constants.fw_sbp2_path) diff --git a/Resources/ModelArray.py b/Resources/ModelArray.py index e1265cf11..f668a7ce3 100644 --- a/Resources/ModelArray.py +++ b/Resources/ModelArray.py @@ -73,49 +73,6 @@ SupportedSMBIOS = [ "Xserve3,1", ] -# CPU patches - -DualSocket = ["MacPro3,1", "MacPro4,1", "MacPro5,1", "Xserve2,1", "Xserve3,1", "Dortania1,1"] - -# Ethernet patches - -EthernetNvidia = [ - "MacBook5,1", - "MacBook5,2", - "MacBook6,1", - "MacBook7,1", - "MacBookPro5,1", - "MacBookPro5,2", - "MacBookPro5,3", - "MacBookPro5,4", - "MacBookPro5,5", - "Macmini3,1", - "iMac9,1", - "iMac10,1", - "Dortania1,1", -] -EthernetMarvell = ["MacBook4,1", "MacBookPro4,1", "iMac7,1", "iMac8,1", "Dortania1,1"] -EthernetBroadcom = [ - "MacBookAir4,1", - "MacBookAir4,2", - "MacBookPro6,1", - "MacBookPro6,2", - "MacBookPro7,1", - "MacBookPro8,1", - "MacBookPro8,2", - "MacBookPro8,3", - "Macmini4,1", - "Macmini5,1", - "Macmini5,2", - "Macmini5,3", - "iMac11,1", - "iMac11,2", - "iMac11,3", - "iMac12,1", - "iMac12,2", - "Dortania1,1", -] - # Audio LegacyAudio = [ @@ -159,26 +116,6 @@ LegacyAudio = [ "Dortania1,1", ] -nvidiaHDEF = [ - "MacBook5,1", - "MacBook5,2", - "MacBook6,1", - "MacBook7,1", - "MacBookAir2,1", - "MacBookAir3,1", - "MacBookAir3,2", - "MacBookPro5,1", - "MacBookPro5,2", - "MacBookPro5,3", - "MacBookPro5,4", - "MacBookPro5,5", - "MacBookPro7,1", - "Macmini3,1", - "Macmini4,1", - "iMac9,1", - "iMac10,1", -] - # GPU ModernGPU = [ @@ -414,96 +351,6 @@ AGDPSupport = [ # "MacPro6,1", ] -NoFireWireSupport = [ - "MacBook5,1", - "MacBook6,1", - "MacBook7,1", - "MacBookAir1,1", - "MacBookAir2,1", - "MacBookAir3,1", - "MacBookAir3,2", -] - -# Thunderbolt 1 Macs -Thunderbolt_1 = [ - "MacBookAir4,1", - "MacBookAir4,2", - "MacBookAir5,1", - "MacBookAir5,2", - "MacBookAir6,1", - "MacBookAir6,2", - "MacBookPro8,1", - "MacBookPro8,2", - "MacBookPro8,3", - "MacBookPro9,1", - "MacBookPro9,2", - "MacBookPro10,1", - "MacBookPro10,2", - "Macmini5,1", - "Macmini5,2", - "Macmini5,3", - "Macmini6,1", - "Macmini6,2", - "iMac12,1", - "iMac12,2", - "iMac13,1", - "iMac13,2", - "iMac13,3", - "iMac14,1", - "iMac14,2", - "iMac14,3", - "iMac14,4", - "Dortania1,1", -] - -# Thunderbolt 2 Macs -Thunderbolt_2 = [ - "MacBookAir7,1", - "MacBookAir7,2", - "MacBookPro11,1", - "MacBookPro11,2", - "MacBookPro11,3", - "MacBookPro11,4", - "MacBookPro11,5", - "MacBookPro12,1", - "Macmini7,1", - "iMac15,1", - "iMac16,1", - "iMac17,1", - "iMac16,2", - "MacPro6,1", -] - -# Thunderbolt 3 Macs -Thunderbolt_3 = [ - "MacBookAir8,1", - "MacBookAir8,2", - "MacBookAir9,1", - "MacBookPro13,1", - "MacBookPro13,2", - "MacBookPro13,3", - "MacBookPro14,1", - "MacBookPro14,2", - "MacBookPro14,3", - "MacBookPro15,1", - "MacBookPro15,2", - "MacBookPro15,3", - "MacBookPro15,4", - "MacBookPro16,1", - "MacBookPro16,2", - "MacBookPro16,3", - "MacBookPro16,4", - "Macmini8,1", - "iMac18,1", - "iMac18,2", - "iMac18,3", - "iMac19,1", - "iMac19,2", - "iMac20,1", - "iMac20,2", - "MacPro7,1", -] - Missing_USB_Map = [ "MacBook4,1", "MacBook5,1", @@ -543,6 +390,6 @@ Missing_USB_Map = [ "iMac12,2", "MacPro3,1", "MacPro4,1", - "XServe2,1", - "XServe3,1", + "Xserve2,1", + "Xserve3,1", ] \ No newline at end of file