diff --git a/custom/config-nopicker-custom.plist b/custom/config-nopicker-custom.plist index 6602df5..7310c06 100644 --- a/custom/config-nopicker-custom.plist +++ b/custom/config-nopicker-custom.plist @@ -11,11 +11,51 @@ Comment - add DTGP method + My custom DSDT Enabled - + Path - SSDT-DTGP.aml + DSDT.aml + + + Comment + My custom SSDT + Enabled + + Path + SSDT-1.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-ALS0.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-AWAC-DISABLE.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-BRG0.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-EC-USBX.aml Comment @@ -27,11 +67,19 @@ Comment - USB 2.0 Injection + Read the comment in dsl sample Enabled - + Path - SSDT-EHCI.aml + SSDT-EHCx-DISABLE.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-IMEI.aml Comment @@ -41,6 +89,78 @@ Path SSDT-PLUG.aml + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-PMC.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-PNLF.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-PNLFCFL.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-RTC0-RANGE.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-RTC0.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-SBUS-MCHC.aml + + + Comment + Read the comment in dsl sample + Enabled + + Path + SSDT-UNC.aml + + + Comment + add DTGP method + Enabled + + Path + SSDT-DTGP.aml + + + Comment + USB 2.0 Injection + Enabled + + Path + SSDT-EHCI.aml + Delete @@ -76,14 +196,18 @@ Patch + Base + + BaseSkip + 0 Comment - _Q11 to XQ11 + Replace one byte sequence with another Count - 1 + 0 Enabled Find - X1ExMQ== + ESIzRA== Limit 0 Mask @@ -91,7 +215,7 @@ OemTableId Replace - WFExMQ== + RDMiEQ== ReplaceMask Skip @@ -102,14 +226,18 @@ + Base + \_SB.PCI0.LPCB.HPET + BaseSkip + 0 Comment - _Q12 to XQ12 + HPET _CRS to XCRS Count 1 Enabled Find - X1ExMg== + X0NSUw== Limit 0 Mask @@ -117,7 +245,7 @@ OemTableId Replace - WFExMg== + WENSUw== ReplaceMask Skip @@ -139,6 +267,8 @@ ResetHwSig ResetLogoStatus + + SyncTableIds @@ -148,6 +278,8 @@ Quirks + AllowRelocationBlock + AvoidRuntimeDefrag DevirtualiseMmio @@ -162,6 +294,8 @@ EnableWriteUnprotector + ForceBooterSignature + ForceExitBootServices ProtectMemoryRegions @@ -201,12 +335,7 @@ Delete - - PciRoot(0x0)/Pci(0x1b,0x0) - - MaximumBootBeepVolume - - + Kernel @@ -216,24 +345,6 @@ Arch Any BundlePath - VoodooHDA.kext - Comment - - Enabled - - ExecutablePath - Contents/MacOS/VoodooHDA - MaxKernel - - MinKernel - - PlistPath - Contents/Info.plist - - - Arch - x86_64 - BundlePath Lilu.kext Comment Patch engine @@ -244,13 +355,13 @@ MaxKernel MinKernel - 12.0.0 + 8.0.0 PlistPath Contents/Info.plist Arch - x86_64 + Any BundlePath VirtualSMC.kext Comment @@ -262,7 +373,7 @@ MaxKernel MinKernel - 12.0.0 + 8.0.0 PlistPath Contents/Info.plist @@ -280,15 +391,71 @@ MaxKernel MinKernel - 12.0.0 + 10.0.0 PlistPath Contents/Info.plist + Arch + Any BundlePath - AGPMInjector.kext + AppleALC.kext Comment + Audio patches + Enabled + + ExecutablePath + Contents/MacOS/AppleALC + MaxKernel + MinKernel + 8.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + IntelMausi.kext + Comment + Intel Ethernet LAN + Enabled + + ExecutablePath + Contents/MacOS/IntelMausi + MaxKernel + + MinKernel + 13.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + Legacy_USB3.kext + Comment + XHC ports configuration + Enabled + + ExecutablePath + + MaxKernel + + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + MCEReporterDisabler.kext + Comment + AppleMCEReporter disabler Enabled ExecutablePath @@ -296,11 +463,103 @@ MaxKernel MinKernel - + 19.0.0 PlistPath Contents/Info.plist + Arch + x86_64 + BundlePath + VoodooPS2Controller.kext + Comment + + Enabled + + ExecutablePath + Contents/MacOS/VoodooPS2Controller + MaxKernel + + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext + Comment + + Enabled + + ExecutablePath + Contents/MacOS/VoodooPS2Keyboard + MaxKernel + + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Mouse.kext + Comment + + Enabled + + ExecutablePath + Contents/MacOS/VoodooPS2Mouse + MaxKernel + + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext + Comment + + Enabled + + ExecutablePath + Contents/MacOS/VoodooPS2Trackpad + MaxKernel + + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 + BundlePath + VoodooPS2Controller.kext/Contents/PlugIns/VoodooInput.kext + Comment + + Enabled + + ExecutablePath + Contents/MacOS/VoodooInput + MaxKernel + + MinKernel + 15.0.0 + PlistPath + Contents/Info.plist + + + Arch + x86_64 BundlePath USBPorts.kext Comment @@ -320,9 +579,9 @@ Arch x86_64 BundlePath - MCEReporterDisabler.kext + AGPMInjector.kext Comment - AppleMCEReporter disabler + Enabled ExecutablePath @@ -330,7 +589,7 @@ MaxKernel MinKernel - 19.0.0 + PlistPath Contents/Info.plist @@ -362,6 +621,12 @@ ////AAAAAAAAAAAAAAAAAA== + DummyPowerManagement + + MaxKernel + + MinKernel + Force @@ -371,13 +636,13 @@ BundlePath System/Library/Extensions/IONetworkingFamily.kext Comment - Patch engine + Enabled - Identifier - com.apple.iokit.IONetworkingFamily ExecutablePath Contents/MacOS/IONetworkingFamily + Identifier + com.apple.iokit.IONetworkingFamily MaxKernel 13.99.99 MinKernel @@ -389,41 +654,8 @@ Patch - Base - _cpu_topology_sort - Comment - algrey - cpu_topology_sort -disable _x86_validate_topology - Count - 1 - Enabled - - Find - - 6AAA//8= - - Identifier - kernel - Limit - 0 - Mask - - /wAA//8= - - MaxKernel - 20.99.99 - MinKernel - 17.0.0 - Replace - - Dx9EAAA= - - ReplaceMask - - - Skip - 0 - - + Arch + x86_64 Base Comment @@ -445,7 +677,7 @@ /////wAAAP///wA= MaxKernel - 20.99.99 + 20.3.99 MinKernel 17.0.0 Replace @@ -458,6 +690,43 @@ Skip 0 + + Arch + x86_64 + Base + + Comment + algrey - thenickdude - cpuid_set_cpufamily - force CPUFAMILY_INTEL_PENRYN (Big Sur 11.3 and newer) + Count + 1 + Enabled + + Find + + MdKzAYA9AAAAAAZ1 + + Identifier + kernel + Limit + 0 + Mask + + ////////AAAAAP// + + MaxKernel + 21.99.99 + MinKernel + 20.4.0 + Replace + + urxP6nizAJCQkJDr + + ReplaceMask + + + Skip + 0 + Quirks @@ -477,18 +746,26 @@ DisableRtcChecksum - DummyPowerManagement - + ExtendBTFeatureFlags + ExternalDiskIcons + ForceSecureBootScheme + IncreasePciBarSize LapicKernelPanic + LegacyCommpage + PanicNoKextDump PowerTimeoutKernelPanic + ProvideCurrentCpuInfo + + SetApfsTrimTimeout + -1 ThirdPartyDrives XhciPortLimit @@ -496,10 +773,12 @@ Scheme + CustomKernel + FuzzyMatch KernelArch - x86_64 + Auto KernelCache Auto @@ -516,12 +795,18 @@ Auto HideAuxiliary + LauncherOption + Disabled + LauncherPath + Default PickerAttributes - 1 + 17 PickerAudioAssist PickerMode External + PickerVariant + Auto PollAppleHotKeys ShowPicker @@ -529,7 +814,7 @@ TakeoffDelay 0 Timeout - 0 + 45 Debug @@ -557,13 +842,15 @@ AllowNvramReset AllowSetDefault - + + AllowToggleSip + ApECID 0 AuthRestart - BootProtect - None + BlacklistAppleUpdate + DmgLoading Signed EnablePassword @@ -594,10 +881,36 @@ Not signed for security reasons Enabled + Flavour + OpenShell:UEFIShell:Shell Name UEFI Shell Path OpenShell.efi + RealPath + + TextMode + + + + Arguments + + Auxiliary + + Comment + Memory testing utility + Enabled + + Flavour + MemTest + Name + memtest86 + Path + memtest86/BOOTX64.efi + RealPath + + TextMode + Arguments @@ -607,11 +920,17 @@ Comment Perform shutdown Enabled - + + Flavour + Auto Name Shutdown Path ResetSystem.efi + RealPath + + TextMode + @@ -633,6 +952,8 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 + ForceDisplayRotationInEFI + 0 SystemAudioVolume Rg== boot-args @@ -643,6 +964,8 @@ ZwAAAA== prev-lang:kbd ZW4tVVM6MA== + run-efi-updater + No Delete @@ -659,6 +982,7 @@ 7C436110-AB2A-4BBB-A880-FE41995C9F82 boot-args + ForceDisplayRotationInEFI LegacyEnable @@ -679,6 +1003,8 @@ bluetoothInternalControllerInfo flagstate fmm-computer-name + fmm-mobileme-token-FMM + fmm-mobileme-token-FMM-BridgeHasAccount nvda_drv prev-lang:kbd @@ -698,16 +1024,24 @@ Automatic + CustomMemory + Generic - AdviseWindows + AdviseFeatures + + MaxBIOSVersion MLB {{BOARD_SERIAL}} + ProcessorType + 0 ROM {{ROM}} SpoofVendor + SystemMemoryStatus + Auto SystemProductName {{DEVICE_MODEL}} SystemSerialNumber @@ -723,6 +1057,8 @@ UpdateSMBIOSMode Create + UseRawUuidEncoding + UEFI @@ -733,13 +1069,30 @@ GlobalConnect HideVerbose - - JumpstartHotPlug + JumpstartHotPlug + MinDate - 0 + -1 MinVersion - 0 + -1 + + AppleInput + + AppleEvent + Builtin + CustomDelays + + GraphicsInputMirroring + + KeyInitialDelay + 50 + KeySubsequentDelay + 5 + PointerSpeedDiv + 1 + PointerSpeedMul + 1 Audio @@ -754,7 +1107,11 @@ MinimumVolume 20 PlayChime + Auto + ResetTrafficClass + SetupDelay + 0 VolumeAmplifier 0 @@ -762,20 +1119,166 @@ Drivers - VBoxHfs.efi + + Arguments + + Comment + HFS+ Driver + Enabled + + Path + OpenHfsPlus.efi + + + Arguments + + Comment + + Enabled + + Path OpenRuntime.efi + + + Arguments + + Comment + + Enabled + + Path OpenCanopy.efi - #AudioDxe.efi - #OpenUsbKbDxe.efi - #UsbMouseDxe.efi - #Ps2KeyboardDxe.efi - #Ps2MouseDxe.efi - #HiiDatabase.efi - #NvmExpressDxe.efi - #XhciDxe.efi - #ExFatDxe.efi - #PartitionDxe.efi - #CrScreenshotDxe.efi + + + Arguments + + Comment + + Enabled + + Path + AudioDxe.efi + + + Arguments + + Comment + + Enabled + + Path + OpenPartitionDxe.efi + + + Arguments + + Comment + + Enabled + + Path + OpenUsbKbDxe.efi + + + Arguments + + Comment + + Enabled + + Path + UsbMouseDxe.efi + + + Arguments + + Comment + + Enabled + + Path + Ps2KeyboardDxe.efi + + + Arguments + + Comment + + Enabled + + Path + Ps2MouseDxe.efi + + + Arguments + + Comment + + Enabled + + Path + HiiDatabase.efi + + + Arguments + + Comment + + Enabled + + Path + NvmExpressDxe.efi + + + Arguments + + Comment + + Enabled + + Path + XhciDxe.efi + + + Arguments + + Comment + + Enabled + + Path + ExFatDxe.efi + + + Arguments + + Comment + + Enabled + + Path + CrScreenshotDxe.efi + + + Arguments + + Comment + + Enabled + + Path + ext4_x64.efi + + + Arguments + + Comment + + Enabled + + Path + OpenLinuxBoot.efi + Input @@ -783,8 +1286,6 @@ KeyForgetThreshold 5 - KeyMergeThreshold - 2 KeySupport KeySupportMode @@ -806,6 +1307,10 @@ DirectGopRendering + ForceResolution + + GopPassThrough + Disabled IgnoreTextInGraphics ProvideConsoleGop @@ -831,7 +1336,7 @@ AppleDebugLog - AppleEvent + AppleEg2Info AppleFramebufferInfo @@ -854,7 +1359,7 @@ DeviceProperties FirmwareVolume - + HashServices OSInfo @@ -864,20 +1369,30 @@ Quirks + ActivateHpetSupport + + DisableSecurityPolicy + + EnableVectorAcceleration + ExitBootServicesDelay 0 + ForceOcWriteFlash + <{{THINKPAD}}/> + ForgeUefiSupport + IgnoreInvalidFlexRatio ReleaseUsbOwnership + ReloadOptionRoms + RequestBootVarRouting TscSyncTimeout 0 UnblockFsConnect - - ConnectDrivers - + diff --git a/custom/generate-specific-bootdisk.sh b/custom/generate-specific-bootdisk.sh index 386c13b..5095399 100755 --- a/custom/generate-specific-bootdisk.sh +++ b/custom/generate-specific-bootdisk.sh @@ -30,10 +30,11 @@ Optional options: --master-plist Same as above. --output-bootdisk Optionally change the bootdisk filename --output-plist Optionally change the output plist filename + --thinkpad Sets ForceOcWriteFlash to true --help, -h, help Display this help and exit Placeholders: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}}, - {{ROM}}, {{WIDTH}}, {{HEIGHT}} + {{ROM}}, {{WIDTH}}, {{HEIGHT}}, {{THINKPAD}} Example: ./generate-specific-bootdisk.sh \\ @@ -183,6 +184,12 @@ while (( "$#" )); do shift ;; + + --thinkpad ) + export THINKPAD=true + shift + ;; + *) echo "Invalid option ${1}. Running with default values..." shift @@ -193,12 +200,12 @@ done download_qcow_efi_folder () { - export EFI_FOLDER=./OpenCore-Catalina/EFI + export EFI_FOLDER=./OpenCore/EFI export RESOURCES_FOLDER=./resources/OcBinaryData/Resources # check if we are inside OSX-KVM already # if not, download OSX-KVM locally - [ -d ./OpenCore-Catalina/EFI/ ] || { + [ -d ./OpenCore/EFI/ ] || { [ -d ./OSX-KVM/ ] || git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git export EFI_FOLDER="./OSX-KVM/${EFI_FOLDER}" } @@ -233,6 +240,13 @@ generate_bootdisk () { wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" fi + if [[ "${THINKPAD}" == true ]]; then + echo "Thinkpads: setting ForceOcWriteFlash to true" + export THINKPAD=true + else + export THINKPAD=false + fi + [ -e ./opencore-image-ng.sh ] \ || { wget "${OPENCORE_IMAGE_MAKER_URL}" \ && chmod +x opencore-image-ng.sh ; } @@ -252,6 +266,7 @@ generate_bootdisk () { -e s/\{\{ROM\}\}/"${ROM}"/g \ -e s/\{\{WIDTH\}\}/"${WIDTH:-1920}"/g \ -e s/\{\{HEIGHT\}\}/"${HEIGHT:-1080}"/g \ + -e s/\{\{THINKPAD\}\}/"${THINKPAD:-false}"/g \ "${MASTER_PLIST}" > ./tmp.config.plist || exit 1 else cat < "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" || exit 1 fi diff --git a/custom/opencore-image-ng.sh b/custom/opencore-image-ng.sh index 5743b05..c25be41 100755 --- a/custom/opencore-image-ng.sh +++ b/custom/opencore-image-ng.sh @@ -133,26 +133,26 @@ fish part-add /dev/sda p 302048 -2048 fish part-set-gpt-type /dev/sda 1 C12A7328-F81F-11D2-BA4B-00A0C93EC93B fish part-set-bootable /dev/sda 1 true fish mkfs vfat /dev/sda1 label:EFI -fish mkfs vfat /dev/sda2 label:OpenCoreBoo +fish mkfs vfat /dev/sda2 label:OpenCore fish mount /dev/sda2 / fish mkdir /ESP fish mount /dev/sda1 /ESP msg "copy files to disk image" cp -v "$cfg" $WORK/config.plist -fish mkdir /ESP/EFI -fish mkdir /ESP/EFI/OC -fish mkdir /ESP/EFI/OC/Kexts -fish mkdir /ESP/EFI/OC/ACPI -fish mkdir /ESP/EFI/OC/Resources -fish mkdir /ESP/EFI/OC/Tools -fish copy-in $WORK/EFI/BOOT /ESP/EFI -fish copy-in $WORK/EFI/OC/OpenCore.efi /ESP/EFI/OC -fish copy-in $WORK/EFI/OC/Drivers /ESP/EFI/OC/ -fish copy-in $WORK/EFI/OC/Kexts /ESP/EFI/OC/ -fish copy-in $WORK/EFI/OC/ACPI /ESP/EFI/OC/ -fish copy-in $WORK/EFI/OC/Resources /ESP/EFI/OC/ -fish copy-in $WORK/EFI/OC/Tools /ESP/EFI/OC/ +fish mkdir /ESP/EFI +fish mkdir /ESP/EFI/OC +fish mkdir /ESP/EFI/OC/Kexts +fish mkdir /ESP/EFI/OC/ACPI +fish mkdir /ESP/EFI/OC/Resources +fish mkdir /ESP/EFI/OC/Tools +fish copy-in $WORK/EFI/BOOT /ESP/EFI +fish copy-in $WORK/EFI/OC/OpenCore.efi /ESP/EFI/OC +fish copy-in $WORK/EFI/OC/Drivers /ESP/EFI/OC/ +fish copy-in $WORK/EFI/OC/Kexts /ESP/EFI/OC/ +fish copy-in $WORK/EFI/OC/ACPI /ESP/EFI/OC/ +fish copy-in $BASE/resources/OcBinaryData/Resources /ESP/EFI/OC/ +fish copy-in $WORK/EFI/OC/Tools /ESP/EFI/OC/ # Note fish copy-in startup.nsh /