diff --git a/.gitignore b/.gitignore index 0b7b27d..adb57a0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,12 @@ EFI/OC/Kexts/Lilu.kext EFI/OC/Kexts/AppleALC.kext EFI/OC/Kexts/WhateverGreen.kext EFI/OC/Kexts/VirtualSMC.kext +EFI/OC/Kexts/BlueToolFixup.kext +EFI/OC/Kexts/BrcmBluetoothInjector.kext +EFI/OC/Kexts/BrcmNonPatchRAM2.kext +EFI/OC/Kexts/BrcmFirmwareData.kext +EFI/OC/Kexts/BrcmPatchRAM2.kext +EFI/OC/Kexts/BrcmPatchRAM3.kext EFI/OC/Tools/Shell.efi EFI/OC/Tools/ResetSystem.efi EFI/OC/Resources diff --git a/.gitmodules b/.gitmodules index 7ae7f04..75e333a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,6 @@ [submodule "src/MacKernelSDK"] path = src/MacKernelSDK url = https://github.com/acidanthera/MacKernelSDK.git +[submodule "src/BrcmPatchRAM"] + path = src/BrcmPatchRAM + url = https://github.com/acidanthera/BrcmPatchRAM.git diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist index 15c848f..213025b 100644 --- a/EFI/OC/config.plist +++ b/EFI/OC/config.plist @@ -307,6 +307,8 @@ 0 RebuildAppleMemoryMap + ResizeAppleGpuBars + -1 SetupVirtualMap SignalAppleOS @@ -590,6 +592,114 @@ PlistPath Contents/Info.plist + + Arch + x86_64 + BundlePath + BrcmFirmwareData.kext + Comment + Bluetooth firmware + Enabled + + ExecutablePath + Contents/MacOS/BrcmFirmwareData + MaxKernel + + MinKernel + + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + BrcmNonPatchRAM2.kext + Comment + Bluetooth support for macOS 10.11-10.14 + Enabled + + ExecutablePath + Contents/MacOS/BrcmNonPatchRAM2 + MaxKernel + 18.99.99 + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + BrcmPatchRAM2.kext + Comment + Bluetooth support for macOS 10.11-10.14 + Enabled + + ExecutablePath + Contents/MacOS/BrcmPatchRAM2 + MaxKernel + 18.99.99 + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + BrcmPatchRAM3.kext + Comment + Bluetooth support for macOS 10.15- + Enabled + + ExecutablePath + Contents/MacOS/BrcmPatchRAM3 + MaxKernel + + MinKernel + 19.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + BrcmBluetoothInjector.kext + Comment + Bluetooth support for macOS 10.15-11 + Enabled + + ExecutablePath + + MaxKernel + 20.99.99 + MinKernel + 19.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + BlueToolFixup.kext + Comment + Bluetooth support for macOS 12- + Enabled + + ExecutablePath + Contents/MacOS/BlueToolFixup + MaxKernel + + MinKernel + 21.0.0 + PlistPath + Contents/Info.plist + Block @@ -873,7 +983,7 @@ Arguments Auxiliary - + Comment Not signed for security reasons Enabled @@ -939,8 +1049,6 @@ DefaultBackgroundColor AAAAAA== - UIScale - AQ== 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102 @@ -967,7 +1075,6 @@ 4D1EDE05-38C7-4A6A-9CC6-4BCCA8B38C14 - UIScale DefaultBackgroundColor 4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102 @@ -1310,6 +1417,8 @@ ProvideConsoleGop + ReconnectGraphicsOnConnect + ReconnectOnResChange ReplaceTabWithSpace @@ -1320,6 +1429,8 @@ TextRenderer BuiltinGraphics + UIScale + 0 UgaPassThrough @@ -1370,6 +1481,8 @@ EnableVectorAcceleration + EnableVmx + ExitBootServicesDelay 0 ForceOcWriteFlash @@ -1384,6 +1497,8 @@ RequestBootVarRouting + ResizeGpuBars + -1 TscSyncTimeout 0 UnblockFsConnect diff --git a/Makefile b/Makefile index ed3b22a..72f6be6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,13 @@ KEXTS= \ EFI/OC/Kexts/Lilu.kext \ EFI/OC/Kexts/WhateverGreen.kext \ EFI/OC/Kexts/AppleALC.kext \ - EFI/OC/Kexts/VirtualSMC.kext + EFI/OC/Kexts/VirtualSMC.kext \ + EFI/OC/Kexts/BrcmNonPatchRAM2.kext \ + EFI/OC/Kexts/BrcmPatchRAM2.kext \ + EFI/OC/Kexts/BrcmPatchRAM3.kext \ + EFI/OC/Kexts/BrcmBluetoothInjector.kext \ + EFI/OC/Kexts/BlueToolFixup.kext \ + EFI/OC/Kexts/BrcmFirmwareData.kext DRIVERS= \ EFI/OC/Drivers/OpenHfsPlus.efi \ @@ -95,6 +101,41 @@ src/VirtualSMC/build/Release/VirtualSMC.kext : src/VirtualSMC/Lilu.kext src/Virt cd src/VirtualSMC && xcodebuild -configuration Release touch $@ +# BrcmPatchRAM: + +src/BrcmPatchRAM/build/Products/Release/BlueToolFixup.kext \ +src/BrcmPatchRAM/build/Products/Release/BrcmNonPatchRAM.kext \ +src/BrcmPatchRAM/build/Products/Release/BrcmNonPatchRAM2.kext \ +src/BrcmPatchRAM/build/Products/Release/BrcmPatchRAM2.kext \ +src/BrcmPatchRAM/build/Products/Release/BrcmPatchRAM3.kext \ +src/BrcmPatchRAM/build/Products/Release/BrcmFirmwareData.kext \ +src/BrcmPatchRAM/build/Products/Release/BrcmBluetoothInjector.kext : src/BrcmPatchRAM/Lilu.kext src/BrcmPatchRAM/MacKernelSDK + # Needs macOS 11 SDK rather than 12.0 to meet deployment target, e.g. from https://github.com/phracker/MacOSX-SDKs and: + # export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk + cd src/BrcmPatchRAM && xcodebuild -configuration Release + touch $@ + +EFI/OC/Kexts/BrcmNonPatchRAM.kext : src/BrcmPatchRAM/build/Products/Release/BrcmNonPatchRAM.kext + cp -a $< $@ + +EFI/OC/Kexts/BrcmNonPatchRAM2.kext : src/BrcmPatchRAM/build/Products/Release/BrcmNonPatchRAM2.kext + cp -a $< $@ + +EFI/OC/Kexts/BrcmPatchRAM2.kext : src/BrcmPatchRAM/build/Products/Release/BrcmPatchRAM2.kext + cp -a $< $@ + +EFI/OC/Kexts/BrcmPatchRAM3.kext : src/BrcmPatchRAM/build/Products/Release/BrcmPatchRAM3.kext + cp -a $< $@ + +EFI/OC/Kexts/BrcmBluetoothInjector.kext : src/BrcmPatchRAM/build/Products/Release/BrcmBluetoothInjector.kext + cp -a $< $@ + +EFI/OC/Kexts/BlueToolFixup.kext : src/BrcmPatchRAM/build/Products/Release/BlueToolFixup.kext + cp -a $< $@ + +EFI/OC/Kexts/BrcmFirmwareData.kext : src/BrcmPatchRAM/build/Products/Release/BrcmFirmwareData.kext + cp -a $< $@ + # Lilu: EFI/OC/Kexts/Lilu.kext : src/Lilu/build/Release/Lilu.kext @@ -106,7 +147,8 @@ src/Lilu/build/Release/Lilu.kext src/Lilu/build/Debug/Lilu.kext : src/Lilu/MacKe src/WhateverGreen/Lilu.kext \ src/AppleALC/Lilu.kext \ -src/VirtualSMC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext +src/VirtualSMC/Lilu.kext \ +src/BrcmPatchRAM/Lilu.kext : src/Lilu/build/Debug/Lilu.kext ln -s ../Lilu/build/Debug/Lilu.kext $@ # MacKernelSDK: @@ -114,7 +156,8 @@ src/VirtualSMC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext src/Lilu/MacKernelSDK \ src/WhateverGreen/MacKernelSDK \ src/AppleALC/MacKernelSDK \ -src/VirtualSMC/MacKernelSDK : src/MacKernelSDK +src/VirtualSMC/MacKernelSDK \ +src/BrcmPatchRAM/MacKernelSDK : src/MacKernelSDK ln -s ../MacKernelSDK $@ # OpenCore: @@ -168,5 +211,5 @@ very-clean : clean rm -rf src/OpenCorePkg/UDK clean : - rm -rf OpenCore-*.dmg OpenCoreEFIFolder-*.zip OpenCore-Image/ src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/UDK/Build \ + rm -rf OpenCore-*.dmg OpenCoreEFIFolder-*.zip OpenCore-Image/ src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/UDK/Build src/BrcmPatchRAM/build \ src/AppleALC/build $(KEXTS) $(DRIVERS) $(TOOLS) $(MISC) diff --git a/src/AppleALC b/src/AppleALC index cac3a3b..2ed6af4 160000 --- a/src/AppleALC +++ b/src/AppleALC @@ -1 +1 @@ -Subproject commit cac3a3b5d8c5c7526897b7645002b01b16347d64 +Subproject commit 2ed6af4505a81c8c8f5a6b18c249eb478266739c diff --git a/src/BrcmPatchRAM b/src/BrcmPatchRAM new file mode 160000 index 0000000..5904574 --- /dev/null +++ b/src/BrcmPatchRAM @@ -0,0 +1 @@ +Subproject commit 590457478fe764aee53ab8441fceab3ebc6be293 diff --git a/src/Lilu b/src/Lilu index b897413..0edf2dd 160000 --- a/src/Lilu +++ b/src/Lilu @@ -1 +1 @@ -Subproject commit b897413d53b8d0e1e8ea7f9d7519d9ff64d15b6d +Subproject commit 0edf2dd01b9284d49a6bfca4bb92af6bbadc7905 diff --git a/src/MacKernelSDK b/src/MacKernelSDK index 6b0e1ec..39336fd 160000 --- a/src/MacKernelSDK +++ b/src/MacKernelSDK @@ -1 +1 @@ -Subproject commit 6b0e1ecda808e1a20401a174b910746f23f5ffcc +Subproject commit 39336fd35fc3721733de156e7437b3fd27949a3a diff --git a/src/OcBinaryData b/src/OcBinaryData index dcf5032..29b2391 160000 --- a/src/OcBinaryData +++ b/src/OcBinaryData @@ -1 +1 @@ -Subproject commit dcf5032351154034e7c8ef6fd15674b1c71e3d92 +Subproject commit 29b23910e5ebb6347fd287776fe79508cbbc1bfe diff --git a/src/OpenCorePkg b/src/OpenCorePkg index d1f60d3..c31c991 160000 --- a/src/OpenCorePkg +++ b/src/OpenCorePkg @@ -1 +1 @@ -Subproject commit d1f60d31eee0cb2983b1594ddb964b24b24e9a0f +Subproject commit c31c991a5f3ab928fe5feebd9169ba936bda6613 diff --git a/src/VirtualSMC b/src/VirtualSMC index 6da45d0..bab6fd5 160000 --- a/src/VirtualSMC +++ b/src/VirtualSMC @@ -1 +1 @@ -Subproject commit 6da45d09775dc93bab90d0fbf1641b383cb69c60 +Subproject commit bab6fd515b0a35e2855faac3ebdc66e1ecf9642d diff --git a/src/WhateverGreen b/src/WhateverGreen index f78b2d9..c608748 160000 --- a/src/WhateverGreen +++ b/src/WhateverGreen @@ -1 +1 @@ -Subproject commit f78b2d903c4975932e72b2c04944ed8e01ce3f6e +Subproject commit c608748deabfc8024883470009a97dbb529b8280