From fa8d3a800e44546106a21e8eaa8efe19a7057266 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Wed, 28 Apr 2021 09:45:30 -0600
Subject: [PATCH] Remove ACPI Patching for Minimal SMBIOS

---
 CHANGELOG.md                 |  1 +
 Resources/Build.py           | 16 ++++++++++++++++
 payloads/Config/config.plist |  6 +++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d4e3aed..10a702236 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Fix IDE support on 2008 era MacBooks, iMacs and Xserves
 - Fix reduced output speeds on BCM94360 series Wifi cards
 - Fix accidentally disabling non-existent iGPU in iMac11,2
+- Remove ACPI Patching requirement for Minimal SMBIOS setups
 
 ## 0.1.1
 - Fix iMac11,3 GFX0 pathing
diff --git a/Resources/Build.py b/Resources/Build.py
index 29b212e9d..86c7fe6f6 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -394,6 +394,12 @@ class BuildOpenCore:
         if self.constants.secure_status is False:
             print("- Disabling SecureBootModel")
             self.config["Misc"]["Security"]["SecureBootModel"] = "Disabled"
+        if self.constants.serial_settings in ["Moderate", "Advanced"]:
+            print("- Enabling USB Rename Patches")
+            self.get_item_by_kv(self.config["ACPI"]["Patch"], "Comment", "XHC1 to SHC1")["Enabled"] = True
+            self.get_item_by_kv(self.config["ACPI"]["Patch"], "Comment", "EHC1 to EH01")["Enabled"] = True
+            self.get_item_by_kv(self.config["ACPI"]["Patch"], "Comment", "EHC2 to EH02")["Enabled"] = True
+
 
     def set_smbios(self):
         spoofed_model = self.model
@@ -490,6 +496,16 @@ class BuildOpenCore:
             try:
                 # Avoid erroring out when specific identity not found
                 map_config["IOKitPersonalities_x86_64"][model_patch]["model"] = self.spoofed_model
+
+                # Avoid ACPI renaming when not required
+                if self.constants.serial_settings == "Minimal":
+                    if map_config["IOKitPersonalities_x86_64"][model_patch]["IONameMatch"] == "EH01":
+                        map_config["IOKitPersonalities_x86_64"][model_patch]["IONameMatch"] = "EHC1"
+                    if map_config["IOKitPersonalities_x86_64"][model_patch]["IONameMatch"] == "EH02":
+                        map_config["IOKitPersonalities_x86_64"][model_patch]["IONameMatch"] = "EHC2"
+                    if map_config["IOKitPersonalities_x86_64"][model_patch]["IONameMatch"] == "SHC1":
+                        map_config["IOKitPersonalities_x86_64"][model_patch]["IONameMatch"] = "XHC1"
+
             except KeyError:
                 continue
 
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 98865152e..a962c2a78 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -38,7 +38,7 @@
 				<key>Count</key>
 				<integer>0</integer>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>Find</key>
 				<data>WEhDMQ==</data>
 				<key>Limit</key>
@@ -68,7 +68,7 @@
 				<key>Count</key>
 				<integer>0</integer>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>Find</key>
 				<data>RUhDMQ==</data>
 				<key>Limit</key>
@@ -98,7 +98,7 @@
 				<key>Count</key>
 				<integer>0</integer>
 				<key>Enabled</key>
-				<true/>
+				<false/>
 				<key>Find</key>
 				<data>RUhDMg==</data>
 				<key>Limit</key>