Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-10 09:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader

Browse Source
This commit is contained in:
jief666 2021-09-28 11:28:54 +03:00
commit c7161c8e97
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist
View File

@ -183,8 +183,6 @@
<true/>
<key>FixHPET</key>
<true/>
<key>FixHeaders</key>
<true/>
<key>FixLAN</key>
<true/>
<key>FixRTC</key>
@ -1174,4 +1172,4 @@
<false/>
</dict>
</dict>
</plist>
</plist>

10
rEFIt_UEFI/refit/main.cpp
View File

@ -1151,9 +1151,9 @@ void LOADER_ENTRY::StartLoader()
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Add.Values[kextIdx]->ExecutablePath, S8Printf("Contents\\MacOS\\%ls", KextEntry.FileName.subString(0, KextEntry.FileName.rindexOf(".")).wc_str()).c_str());
}
XStringW infoPlistPath = SWPrintf("%s\\Contents\\Info.plist", OC_BLOB_GET(&mOpenCoreConfiguration.Kernel.Add.Values[kextIdx]->BundlePath));
if ( FileExists(&self.getCloverDir(), infoPlistPath) ) {
if (FileExists(&self.getCloverDir(), infoPlistPath)) {
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Add.Values[kextIdx]->PlistPath, "Contents/Info.plist"); // TODO : is always Contents/Info.plist ?
}else{
} else {
DBG("Cannot find kext info.plist at '%ls'\n", infoPlistPath.wc_str());
}
#endif
@ -1371,7 +1371,7 @@ void LOADER_ENTRY::StartLoader()
if ( macOSVersion >= MacOsVersion("10.11"_XS8) ) {
if (OSFLAG_ISSET(Flags, OSFLAG_NOSIP)) {
gSettings.RtVariables.CsrActiveConfig = (UINT32)0xB7F;
gSettings.RtVariables.CsrActiveConfig = (UINT32)0xB6F;
gSettings.RtVariables.BooterConfig = 0x28;
}
// ReadSIPCfg();
@ -3174,7 +3174,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
//now it is a time to set RtVariables
SetVariablesFromNvram();
XString8Array TmpArgs = Split<XString8Array>(gSettings.Boot.BootArgs, " ");
XString8Array TmpArgs = Split<XString8Array>(gSettings.Boot.BootArgs, " ");
DBG("after NVRAM boot-args=%s\n", gSettings.Boot.BootArgs.c_str());
GlobalConfig.OptionsBits = EncodeOptions(TmpArgs);
// DBG("initial OptionsBits %X\n", GlobalConfig.OptionsBits);
@ -3525,7 +3525,7 @@ panic("not done yet");
(UINT16*)&BootNum
);
if (!EFI_ERROR(Status)) {
DBG("Entry %lld assigned option %04llX\n", EntryIndex, BootNum);
DBG("Entry %lld assigned option %04llX\n", EntryIndex, BootNum);
Entry->BootNum = BootNum;
}
FreePool(OptionalData);