Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-01-10 19:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #442 from serdeliuk/master

Browse Source 
Opencore 0.6.5 upgrade with latest Clover integration
This commit is contained in:
jief666 2021-09-16 09:46:42 +03:00 committed by GitHub
commit 724c549916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +1,4 @@
[submodule "OpenCorePkg"] [submodule "OpenCorePkg"]
url = https://github.com/CloverHackyColor/OpenCorePkg
branch = master
path = OpenCorePkg path = OpenCorePkg
url = https://github.com/CloverHackyColor/OpenCorePkg.git

45
CloverPackage/CloverV2/EFI/CLOVER/config-oc-sample.plist Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>#Sample OC config file</key>
<string>by serdeliuk</string>
<key>Misc</key>
<dict>
<key>Security</key>
<dict>
<key>AllowNvramReset</key>
<true/>
<key>AllowSetDefault</key>
<true/>
<key>ApECID</key>
<integer>0</integer>
<key>AuthRestart</key>
<false/>
<key>BlacklistAppleUpdate</key>
<true/>
<key>BootProtect</key>
<string>None</string>
<key>DmgLoading</key>
<string>Signed</string>
<key>EnablePassword</key>
<false/>
<key>ExposeSensitiveData</key>
<integer>6</integer>
<key>HaltLevel</key>
<integer>2147483648</integer>
<key>PasswordHash</key>
<data></data>
<key>PasswordSalt</key>
<data></data>
<key>ScanPolicy</key>
<integer>0</integer>
<key>SecureBootModel</key>
<string>Disabled</string>
<key>Vault</key>
<string>Optional</string>
</dict>
</dict>
</dict>
</plist>

2
OpenCorePkg

@ -1 +1 @@
Subproject commit b0aac62accc46de3297b2fa3b50e34f0d03460bd Subproject commit 046e209ceb7b93e25821319388eb9c4c6015aa6a

1
rEFIt_UEFI/refit.inf
View File

@ -529,6 +529,7 @@
gMsgLogProtocolGuid gMsgLogProtocolGuid
gEfiPlatformDriverOverrideProtocolGuid gEfiPlatformDriverOverrideProtocolGuid
gEmuVariableControlProtocolGuid gEmuVariableControlProtocolGuid
gEfiAudioDecodeProtocolGuid # PRODUCES
gEfiAudioIoProtocolGuid # CONSUMES gEfiAudioIoProtocolGuid # CONSUMES
gOcQuirksProtocolGuid gOcQuirksProtocolGuid
gAptioMemoryFixProtocolGuid gAptioMemoryFixProtocolGuid

6
rEFIt_UEFI/refit/main.cpp
View File

@ -630,7 +630,8 @@ void debugStartImageWithOC()
EFI_LOADED_IMAGE* OcLoadedImage; EFI_LOADED_IMAGE* OcLoadedImage;
EFI_STATUS Status = gBS->HandleProtocol(gImageHandle, &gEfiLoadedImageProtocolGuid, (void **) &OcLoadedImage); EFI_STATUS Status = gBS->HandleProtocol(gImageHandle, &gEfiLoadedImageProtocolGuid, (void **) &OcLoadedImage);
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL* FileSystem = LocateFileSystem(OcLoadedImage->DeviceHandle, OcLoadedImage->FilePath); EFI_SIMPLE_FILE_SYSTEM_PROTOCOL* FileSystem = LocateFileSystem(OcLoadedImage->DeviceHandle, OcLoadedImage->FilePath);
Status = OcStorageInitFromFs(&mOpenCoreStorage, FileSystem, self.getCloverDirFullPath().wc_str(), NULL); // Status = OcStorageInitFromFs(&mOpenCoreStorage, FileSystem, self.getCloverDirFullPath().wc_str(), NULL);
Status = OcStorageInitFromFs(&mOpenCoreStorage, FileSystem, NULL, NULL, self.getCloverDirFullPath().wc_str(), NULL);
Status = ClOcReadConfigurationFile(&mOpenCoreStorage, L"config-oc.plist", &mOpenCoreConfiguration); Status = ClOcReadConfigurationFile(&mOpenCoreStorage, L"config-oc.plist", &mOpenCoreConfiguration);
if ( EFI_ERROR(Status) ) panic("ClOcReadConfigurationFile"); if ( EFI_ERROR(Status) ) panic("ClOcReadConfigurationFile");
@ -862,7 +863,8 @@ void LOADER_ENTRY::StartLoader()
EFI_LOADED_IMAGE* OcLoadedImage; EFI_LOADED_IMAGE* OcLoadedImage;
Status = gBS->HandleProtocol(gImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &OcLoadedImage); Status = gBS->HandleProtocol(gImageHandle, &gEfiLoadedImageProtocolGuid, (VOID **) &OcLoadedImage);
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL* FileSystem = LocateFileSystem(OcLoadedImage->DeviceHandle, OcLoadedImage->FilePath); EFI_SIMPLE_FILE_SYSTEM_PROTOCOL* FileSystem = LocateFileSystem(OcLoadedImage->DeviceHandle, OcLoadedImage->FilePath);
Status = OcStorageInitFromFs(&mOpenCoreStorage, FileSystem, self.getCloverDirFullPath().wc_str(), NULL); // Status = OcStorageInitFromFs(&mOpenCoreStorage, FileSystem, self.getCloverDirFullPath().wc_str(), NULL);
Status = OcStorageInitFromFs(&mOpenCoreStorage, FileSystem, NULL, NULL, self.getCloverDirFullPath().wc_str(), NULL);
/* /*
* Define READ_FROM_OC to have mOpenCoreConfiguration initialized from config-oc.plist * Define READ_FROM_OC to have mOpenCoreConfiguration initialized from config-oc.plist