From 7df345d28698e981d629e6913cac005ea02d83c4 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Sun, 9 May 2021 10:29:52 -0600
Subject: [PATCH] Fix USB mapping witout CPUFriend

---
 CHANGELOG.md          | 1 -
 Resources/Build.py    | 5 ++---
 Resources/SysPatch.py | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ab01469f..230619f0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,6 @@
 - Fix iMac9,1 audio support
 - Heavily expand Graphics ID list
 - Fix iMac7,1 audio support
-- Add partial TeraScale 2 support
 
 ## 0.1.2
 - Fix IDE support on 2008 era MacBooks, iMacs and Xserves
diff --git a/Resources/Build.py b/Resources/Build.py
index ae60ad95c..20bf8babb 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -641,7 +641,7 @@ class BuildOpenCore:
             self.config["PlatformInfo"]["CustomMemory"] = True
 
         # USB Map and CPUFriend Patching
-        if self.constants.allow_oc_everywhere is False and self.model != "iMac7,1" and self.constants.disallow_cpufriend is False:
+        if self.constants.allow_oc_everywhere is False and self.model != "iMac7,1":
             new_map_ls = Path(self.constants.map_contents_folder) / Path("Info.plist")
             map_config = plistlib.load(Path(new_map_ls).open("rb"))
 
@@ -662,9 +662,8 @@ class BuildOpenCore:
 
                 except KeyError:
                     continue
-
             plistlib.dump(map_config, Path(new_map_ls).open("wb"), sort_keys=True)
-
+        if self.constants.allow_oc_everywhere is False and self.model != "iMac7,1" and self.constants.disallow_cpufriend is False:
             # Adjust CPU Friend Data to correct SMBIOS
             new_cpu_ls = Path(self.constants.pp_contents_folder) / Path("Info.plist")
             cpu_config = plistlib.load(Path(new_cpu_ls).open("rb"))
diff --git a/Resources/SysPatch.py b/Resources/SysPatch.py
index ab396aacc..c7e995827 100644
--- a/Resources/SysPatch.py
+++ b/Resources/SysPatch.py
@@ -137,7 +137,7 @@ class PatchSysVolume:
                 #    print("- Merging legacy Nvidia Kepler Kexts and Bundles")
                 #    self.add_new_binaries(ModelArray.AddNvidiaKeplerAccel11, self.constants.legacy_nvidia_kepler_path)
             elif dgpu_vendor == self.constants.pci_amd_ati:
-                if dgpu_device in PCIIDArray.amd_ids().terascale_1_ids or dgpu_device in PCIIDArray.amd_ids().terascale_2_ids:
+                if dgpu_device in PCIIDArray.amd_ids().terascale_1_ids:
                     print("- Merging legacy AMD Kexts and Bundles")
                     self.delete_old_binaries(ModelArray.DeleteAMDAccel11)
                     self.add_new_binaries(ModelArray.AddGeneralAccel, self.constants.legacy_general_path)