Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid GetDefaultSettings scratching SmUUID read from smbios.

Browse Source
This commit is contained in:
jief666 2020-09-24 15:06:10 +03:00
parent 29bdb1bdcd
commit e48ae97c60
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenCorePkg

@ -1 +1 @@
Subproject commit a04b6b99e74b53f7dadb745e45b31c34f15e532a
Subproject commit 057a9b41309bf098deac9a2b687ec4e3a364cdc0

2
rEFIt_UEFI/Platform/guid.h
View File

@ -14,6 +14,8 @@
extern "C" EFI_GUID gEfiMiscSubClassGuid;
constexpr const LString8 nullGuid = "00000000-0000-0000-0000-000000000000";
/** Returns TRUE is Str is ascii Guid in format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx */
template <typename T, enable_if( is___String(T) )>
BOOLEAN IsValidGuidAsciiString(const T& Str)

3
rEFIt_UEFI/Platform/platformdata.cpp
View File

@ -7,6 +7,7 @@
#include "smbios.h"
#include "cpu.h"
#include "Nvram.h"
#include "guid.h"
/* Machine Default Data */
@ -1398,7 +1399,7 @@ VOID GetDefaultSettings()
gSettings.BacklightLevelConfig = FALSE;
gSettings.TrustSMBIOS = TRUE;
gSettings.SmUUID.setEmpty();
gSettings.SmUUID = nullGuid;
gSettings.DefaultBackgroundColor = 0x80000000; //the value to delete the variable
gSettings.RtROM.setEmpty();
gSettings.CsrActiveConfig = 0xFFFF;

16
rEFIt_UEFI/refit/main.cpp
View File

@ -1394,6 +1394,7 @@ DBG("Beginning OC\n");
!defined(USE_OC_SECTION_Nvram) && !defined(USE_OC_SECTION_PlatformInfo) && !defined(USE_OC_SECTION_Uefi)
memset(&mOpenCoreConfiguration, 0, sizeof(mOpenCoreConfiguration));
DBG("config-oc.plist isn't use at all\n");
#else
Status = ClOcReadConfigurationFile(&mOpenCoreStorage, L"config-oc.plist", &mOpenCoreConfiguration);
@ -1456,10 +1457,20 @@ DBG("Beginning OC\n");
// mOpenCoreConfiguration.Misc.Debug.DisableWatchDog = true; // already done by Clover ?
mOpenCoreConfiguration.Misc.Debug.DisplayLevel = 0x80400042;
mOpenCoreConfiguration.Misc.Debug.Target = 0x41;
}else{
#ifdef JIEF_DEBUG
egSetGraphicsModeEnabled(false);
mOpenCoreConfiguration.Misc.Debug.ApplePanic = true;
mOpenCoreConfiguration.Misc.Debug.DisplayLevel = 0x80000042;
mOpenCoreConfiguration.Misc.Debug.Target = 0x3;
#endif
}
OC_STRING_ASSIGN(mOpenCoreConfiguration.Misc.Security.SecureBootModel, "Disabled");
OC_STRING_ASSIGN(mOpenCoreConfiguration.Misc.Security.Vault, "Optional");
#ifdef JIEF_DEBUG
mOpenCoreConfiguration.Nvram.WriteFlash = true;
#endif
#ifndef USE_OC_SECTION_Booter
@ -1587,7 +1598,7 @@ DBG("Beginning OC\n");
#endif
mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = true;
// mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = true;
OC_STRING_ASSIGN(mOpenCoreConfiguration.Uefi.Output.Resolution, XString8(GlobalConfig.ScreenResolution).c_str());
OcMain(&mOpenCoreStorage, NULL);
@ -2578,6 +2589,8 @@ RefitMain (IN EFI_HANDLE ImageHandle,
//debugStartImageWithOC(); // ok BS_I
GetDefaultSettings(); // do this before PrepatchSmbios() because PrepatchSmbios() change gSettings.SmUUID.
// TODO : there is a mixup between SmUUID read from the platform and the SmUUID set by the user. They should be read in 2 different vars.
PrepatchSmbios();
//replace / with _
@ -2587,7 +2600,6 @@ RefitMain (IN EFI_HANDLE ImageHandle,
GetCPUProperties();
GetDevices();
GetDefaultSettings();
// LoadOptions Parsing
DBG("Clover load options size = %d bytes\n", SelfLoadedImage->LoadOptionsSize);