Patch: Update BT related patches to include BlueToolFixup

daliansky · Jun 15, 2021 · 3795aa9 · 3795aa9
1 parent cbe779f
commit 3795aa9
Show file tree

Hide file tree

Showing 11 changed files with 161 additions and 132 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -14,6 +14,7 @@
   - Update `HibernationFixup` v1.4.1 (up to [acidanthera/HibernationFixup@ea11e11](https://github.com/acidanthera/HibernationFixup/commit/ea11e11ea22183c5489f150e9d763d4a474848dd))
   - Update `AirportItlwm` v2.0.0 (up to [OpenIntelWireless/itlwm@5eb3a17](https://github.com/OpenIntelWireless/itlwm/commit/5eb3a17d34d2de27b31b57ccadbb4e630fd9a09d)) to support macOS12.0 beta1 (21A5248p)
   - Update `IntelBluetoothFirmware` v1.1.3 to support macOS12.0 beta1 (21A5248p)
+  - Update `VoodooPS2` v2.2.4 (up to [acidanthera/VoodooPS2@f0c7fda](https://github.com/acidanthera/VoodooPS2/commit/f0c7fda3fec51150f77f3cbd9a1e452118a8e8d9))
   - Update `RestrictEvents` v1.0.3 (up to [acidanthera/RestrictEvents@36f6c5c](https://github.com/acidanthera/RestrictEvents/commit/36f6c5caff6d871ba7f2ccfaca59e1cc58b84d19))
 
 ### Add

diff --git a/Docs/Changelog_CN.md b/Docs/Changelog_CN.md
@@ -14,6 +14,7 @@
   * 更新 `HibernationFixup` v1.4.1（更新至 [acidanthera/HibernationFixup@ea11e11](https://github.com/acidanthera/HibernationFixup/commit/ea11e11ea22183c5489f150e9d763d4a474848dd)）
   * 更新 `AirportItlwm` v2.0.0（更新至 [OpenIntelWireless/itlwm@5eb3a17](https://github.com/OpenIntelWireless/itlwm/commit/5eb3a17d34d2de27b31b57ccadbb4e630fd9a09d)）来支持 macOS12.0 beta1 (21A5248p)
   * 更新 `IntelBluetoothFirmware` v1.1.3 来支持 macOS12.0 beta1 (21A5248p)
+  * 更新 `VoodooPS2` v2.2.4（更新至 [acidanthera/VoodooPS2@f0c7fda](https://github.com/acidanthera/VoodooPS2/commit/f0c7fda3fec51150f77f3cbd9a1e452118a8e8d9)）
   * 更新 `RestrictEvents` v1.0.3（更新至 [acidanthera/RestrictEvents@36f6c5c](https://github.com/acidanthera/RestrictEvents/commit/36f6c5caff6d871ba7f2ccfaca59e1cc58b84d19)）
 
 ### 新增

diff --git a/Patches/0001-OC-KBL-Use-Brcm-USB-BT-Doggle.patch b/Patches/0001-OC-KBL-Use-Brcm-USB-BT-Doggle.patch
@@ -1,14 +1,14 @@
-From fc7cf3c95f07ed88378cc623681498e763e9a7d9 Mon Sep 17 00:00:00 2001
+From 747e5f6b6f77362a0ae11244bc2ebcb296bdfdca Mon Sep 17 00:00:00 2001
 From: stevezhengshiqi
-Date: Mon, 14 Jun 2021 23:06:44 +0800
+Date: Wed, 16 Jun 2021 01:27:04 +0800
 Subject: [PATCH] OC: KBL: Use Brcm USB BT Doggle
 
 ---
- OC/config_kbl.plist | 80 ++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 76 insertions(+), 4 deletions(-)
+ OC/config_kbl.plist | 62 ++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 58 insertions(+), 4 deletions(-)
 
 diff --git a/OC/config_kbl.plist b/OC/config_kbl.plist
-index 513eb21..48f7be2 100644
+index cf1d71e..637c640 100644
 --- a/OC/config_kbl.plist
 +++ b/OC/config_kbl.plist
 @@ -130,7 +130,7 @@
@@ -29,32 +29,32 @@ index 513eb21..48f7be2 100644
  				<key>Path</key>
  				<string>SSDT-USB-USBBT.aml</string>
  			</dict>
-@@ -939,6 +939,78 @@
+@@ -965,7 +965,7 @@
+ 				<key>Comment</key>
+ 				<string>Intel bluetooth driver</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string>Contents/MacOS/IntelBluetoothFirmware</string>
+ 				<key>MaxKernel</key>
+@@ -983,7 +983,7 @@
+ 				<key>Comment</key>
+ 				<string>Intel bluetooth driver</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string></string>
+ 				<key>MaxKernel</key>
+@@ -993,6 +993,60 @@
  				<key>PlistPath</key>
  				<string>Contents/Info.plist</string>
  			</dict>
 +			<dict>
 +				<key>Arch</key>
 +				<string>x86_64</string>
 +				<key>BundlePath</key>
-+				<string>BlueToolFixup.kext</string>
-+				<key>Comment</key>
-+				<string></string>
-+				<key>Enabled</key>
-+				<true/>
-+				<key>ExecutablePath</key>
-+				<string>Contents/MacOS/BlueToolFixup</string>
-+				<key>MaxKernel</key>
-+				<string></string>
-+				<key>MinKernel</key>
-+				<string>21.0.0</string>
-+				<key>PlistPath</key>
-+				<string>Contents/Info.plist</string>
-+			</dict>
-+			<dict>
-+				<key>Arch</key>
-+				<string>x86_64</string>
-+				<key>BundlePath</key>
 +				<string>BrcmBluetoothInjector.kext</string>
 +				<key>Comment</key>
 +				<string></string>
@@ -105,27 +105,9 @@ index 513eb21..48f7be2 100644
 +				<key>PlistPath</key>
 +				<string>Contents/Info.plist</string>
 +			</dict>
- 			<dict>
- 				<key>Arch</key>
- 				<string>x86_64</string>
-@@ -947,7 +1019,7 @@
- 				<key>Comment</key>
- 				<string>Intel bluetooth driver</string>
- 				<key>Enabled</key>
--				<true/>
-+				<false/>
- 				<key>ExecutablePath</key>
- 				<string>Contents/MacOS/IntelBluetoothFirmware</string>
- 				<key>MaxKernel</key>
-@@ -965,7 +1037,7 @@
- 				<key>Comment</key>
- 				<string>Intel bluetooth driver</string>
- 				<key>Enabled</key>
--				<true/>
-+				<false/>
- 				<key>ExecutablePath</key>
- 				<string></string>
- 				<key>MaxKernel</key>
+ 		</array>
+ 		<key>Block</key>
+ 		<array/>
 -- 
 2.32.0
 
diff --git a/Patches/0002-OC-CML-Use-Brcm-USB-BT-Doggle.patch b/Patches/0002-OC-CML-Use-Brcm-USB-BT-Doggle.patch
@@ -1,14 +1,14 @@
-From 943672c86c75460cef1fb6c9ef2b50e11ec50c3b Mon Sep 17 00:00:00 2001
+From 594226a8a68127df523419e2ca9d8cad4523de43 Mon Sep 17 00:00:00 2001
 From: stevezhengshiqi
-Date: Mon, 14 Jun 2021 23:18:19 +0800
+Date: Wed, 16 Jun 2021 01:31:03 +0800
 Subject: [PATCH] OC: CML: Use Brcm USB BT Doggle
 
 ---
- OC/config_cml.plist | 80 ++++++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 76 insertions(+), 4 deletions(-)
+ OC/config_cml.plist | 62 ++++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 58 insertions(+), 4 deletions(-)
 
 diff --git a/OC/config_cml.plist b/OC/config_cml.plist
-index 63a535f..5c38965 100644
+index 07e190c..bbe4fd0 100644
 --- a/OC/config_cml.plist
 +++ b/OC/config_cml.plist
 @@ -130,7 +130,7 @@
@@ -29,32 +29,32 @@ index 63a535f..5c38965 100644
  				<key>Path</key>
  				<string>SSDT-USB-USBBT.aml</string>
  			</dict>
-@@ -884,6 +884,78 @@
+@@ -910,7 +910,7 @@
+ 				<key>Comment</key>
+ 				<string>Intel bluetooth driver</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string>Contents/MacOS/IntelBluetoothFirmware</string>
+ 				<key>MaxKernel</key>
+@@ -928,7 +928,7 @@
+ 				<key>Comment</key>
+ 				<string>Intel bluetooth driver</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string></string>
+ 				<key>MaxKernel</key>
+@@ -938,6 +938,60 @@
  				<key>PlistPath</key>
  				<string>Contents/Info.plist</string>
  			</dict>
 +			<dict>
 +				<key>Arch</key>
 +				<string>x86_64</string>
 +				<key>BundlePath</key>
-+				<string>BlueToolFixup.kext</string>
-+				<key>Comment</key>
-+				<string></string>
-+				<key>Enabled</key>
-+				<true/>
-+				<key>ExecutablePath</key>
-+				<string>Contents/MacOS/BlueToolFixup</string>
-+				<key>MaxKernel</key>
-+				<string></string>
-+				<key>MinKernel</key>
-+				<string>21.0.0</string>
-+				<key>PlistPath</key>
-+				<string>Contents/Info.plist</string>
-+			</dict>
-+			<dict>
-+				<key>Arch</key>
-+				<string>x86_64</string>
-+				<key>BundlePath</key>
 +				<string>BrcmBluetoothInjector.kext</string>
 +				<key>Comment</key>
 +				<string></string>
@@ -105,27 +105,9 @@ index 63a535f..5c38965 100644
 +				<key>PlistPath</key>
 +				<string>Contents/Info.plist</string>
 +			</dict>
- 			<dict>
- 				<key>Arch</key>
- 				<string>x86_64</string>
-@@ -892,7 +964,7 @@
- 				<key>Comment</key>
- 				<string>Intel bluetooth driver</string>
- 				<key>Enabled</key>
--				<true/>
-+				<false/>
- 				<key>ExecutablePath</key>
- 				<string>Contents/MacOS/IntelBluetoothFirmware</string>
- 				<key>MaxKernel</key>
-@@ -910,7 +982,7 @@
- 				<key>Comment</key>
- 				<string>Intel bluetooth driver</string>
- 				<key>Enabled</key>
--				<true/>
-+				<false/>
- 				<key>ExecutablePath</key>
- 				<string></string>
- 				<key>MaxKernel</key>
+ 		</array>
+ 		<key>Block</key>
+ 		<array/>
 -- 
 2.32.0
 
diff --git a/Patches/0003-OC-KBL-Block-Intel-BT.patch b/Patches/0003-OC-KBL-Block-Intel-BT.patch
@@ -1,14 +1,14 @@
-From 982bf4c84340ba84bd83c8cdea1e86644969698b Mon Sep 17 00:00:00 2001
+From 32116157a8402aa7a61f669fff8afbf9e26c0190 Mon Sep 17 00:00:00 2001
 From: stevezhengshiqi
-Date: Mon, 14 Jun 2021 23:22:42 +0800
+Date: Wed, 16 Jun 2021 01:54:35 +0800
 Subject: [PATCH] OC: KBL: Block Intel BT
 
 ---
- OC/config_kbl.plist | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ OC/config_kbl.plist | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/OC/config_kbl.plist b/OC/config_kbl.plist
-index 513eb21..00b2d27 100644
+index cf1d71e..a80a44f 100644
 --- a/OC/config_kbl.plist
 +++ b/OC/config_kbl.plist
 @@ -130,7 +130,7 @@
@@ -30,6 +30,15 @@ index 513eb21..00b2d27 100644
  				<string>SSDT-USB-USBBT.aml</string>
  			</dict>
 @@ -947,7 +947,7 @@
+ 				<key>Comment</key>
+ 				<string>Force BlueTool to skip firmware update on Monterey</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string>Contents/MacOS/BlueToolFixup</string>
+ 				<key>MaxKernel</key>
+@@ -965,7 +965,7 @@
  				<key>Comment</key>
  				<string>Intel bluetooth driver</string>
  				<key>Enabled</key>
@@ -38,7 +47,7 @@ index 513eb21..00b2d27 100644
  				<key>ExecutablePath</key>
  				<string>Contents/MacOS/IntelBluetoothFirmware</string>
  				<key>MaxKernel</key>
-@@ -965,7 +965,7 @@
+@@ -983,7 +983,7 @@
  				<key>Comment</key>
  				<string>Intel bluetooth driver</string>
  				<key>Enabled</key>

diff --git a/Patches/0004-OC-CML-Block-Intel-BT.patch b/Patches/0004-OC-CML-Block-Intel-BT.patch
@@ -1,14 +1,14 @@
-From d82ed33416a706ca40176ee708e0ecb6078719d0 Mon Sep 17 00:00:00 2001
+From d7a6ca3e1b86096471d24208223db0a4f27fe835 Mon Sep 17 00:00:00 2001
 From: stevezhengshiqi
-Date: Mon, 14 Jun 2021 23:23:58 +0800
+Date: Wed, 16 Jun 2021 01:56:10 +0800
 Subject: [PATCH] OC: CML: Block Intel BT
 
 ---
- OC/config_cml.plist | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ OC/config_cml.plist | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/OC/config_cml.plist b/OC/config_cml.plist
-index 63a535f..5984731 100644
+index 07e190c..b4a784c 100644
 --- a/OC/config_cml.plist
 +++ b/OC/config_cml.plist
 @@ -130,7 +130,7 @@
@@ -30,6 +30,15 @@ index 63a535f..5984731 100644
  				<string>SSDT-USB-USBBT.aml</string>
  			</dict>
 @@ -892,7 +892,7 @@
+ 				<key>Comment</key>
+ 				<string>Force BlueTool to skip firmware update on Monterey</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string>Contents/MacOS/BlueToolFixup</string>
+ 				<key>MaxKernel</key>
+@@ -910,7 +910,7 @@
  				<key>Comment</key>
  				<string>Intel bluetooth driver</string>
  				<key>Enabled</key>
@@ -38,7 +47,7 @@ index 63a535f..5984731 100644
  				<key>ExecutablePath</key>
  				<string>Contents/MacOS/IntelBluetoothFirmware</string>
  				<key>MaxKernel</key>
-@@ -910,7 +910,7 @@
+@@ -928,7 +928,7 @@
  				<key>Comment</key>
  				<string>Intel bluetooth driver</string>
  				<key>Enabled</key>

diff --git a/Patches/0005-OC-KBL-Solder-BT-to-WLAN_LTE-slot.patch b/Patches/0005-OC-KBL-Solder-BT-to-WLAN_LTE-slot.patch
@@ -1,14 +1,14 @@
-From 6d3ef5dbc0be930b7e697b73cb9b61ff0dcc58cd Mon Sep 17 00:00:00 2001
+From 819d70b08633f75de8b3b34de7f0bd47b6c1f24b Mon Sep 17 00:00:00 2001
 From: stevezhengshiqi
-Date: Mon, 14 Jun 2021 23:29:15 +0800
+Date: Wed, 16 Jun 2021 01:43:02 +0800
 Subject: [PATCH] OC: KBL: Solder BT to WLAN_LTE slot
 
 ---
- OC/config_kbl.plist | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ OC/config_kbl.plist | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/OC/config_kbl.plist b/OC/config_kbl.plist
-index 513eb21..b70a2ce 100644
+index cf1d71e..9af6048 100644
 --- a/OC/config_kbl.plist
 +++ b/OC/config_kbl.plist
 @@ -130,7 +130,7 @@
@@ -30,6 +30,15 @@ index 513eb21..b70a2ce 100644
  				<string>SSDT-USB-WLAN_LTEBT.aml</string>
  			</dict>
 @@ -947,7 +947,7 @@
+ 				<key>Comment</key>
+ 				<string>Force BlueTool to skip firmware update on Monterey</string>
+ 				<key>Enabled</key>
+-				<true/>
++				<false/>
+ 				<key>ExecutablePath</key>
+ 				<string>Contents/MacOS/BlueToolFixup</string>
+ 				<key>MaxKernel</key>
+@@ -965,7 +965,7 @@
  				<key>Comment</key>
  				<string>Intel bluetooth driver</string>
  				<key>Enabled</key>
@@ -38,7 +47,7 @@ index 513eb21..b70a2ce 100644
  				<key>ExecutablePath</key>
  				<string>Contents/MacOS/IntelBluetoothFirmware</string>
  				<key>MaxKernel</key>
-@@ -965,7 +965,7 @@
+@@ -983,7 +983,7 @@
  				<key>Comment</key>
  				<string>Intel bluetooth driver</string>
  				<key>Enabled</key>