Upstream
/
CloverBootloader
mirror of https://github.com/CloverHackyColor/CloverBootloader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert commit 9598d7ec, fix issue 525 

Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2022-07-18 21:11:16 +03:00
parent a5e78463aa
commit 30f3048fbf
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Clover.dsc
View File

@ -594,7 +594,7 @@
} }
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
#MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
#MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf #MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
#MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf #MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

2
Clover.fdf
View File

@ -91,7 +91,7 @@ INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
#INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
#INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf #INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
INF CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf INF CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

9
rEFIt_UEFI/Platform/DataHubCpu.cpp
View File

@ -397,17 +397,14 @@ SetVariablesForOSX(LOADER_ENTRY *Entry)
} }
if (gSettings.RtVariables.HWTarget.notEmpty() && (Entry->LoaderType != OSTYPE_OSX_INSTALLER) && if (gSettings.RtVariables.HWTarget.notEmpty() && (Entry->LoaderType != OSTYPE_OSX_INSTALLER) &&
(Entry->macOSVersion < MacOsVersion("13"_XS8) /*|| gSettings.RtVariables.HWTarget.c_str()[0] != '#'*/) ) { (Entry->macOSVersion < MacOsVersion("13"_XS8) /* || gSettings.RtVariables.HWTarget.c_str()[0] != '#' */) ) {
SetNvramXString8(L"BridgeOSHardwareModel", gEfiAppleNvramGuid, Attributes, gSettings.RtVariables.HWTarget); SetNvramXString8(L"BridgeOSHardwareModel", gEfiAppleNvramGuid, Attributes, gSettings.RtVariables.HWTarget);
SetNvramVariable(L"BridgeOSBootSessionUUID", gEfiAppleBootGuid, Attributes, sizeof(uuid), &uuid);
} else { } else {
DeleteNvramVariable(L"BridgeOSHardwareModel", gEfiAppleNvramGuid); DeleteNvramVariable(L"BridgeOSHardwareModel", gEfiAppleNvramGuid);
DeleteNvramVariable(L"BridgeOSBootSessionUUID", gEfiAppleBootGuid);
} }
/*
if (gSettings.RtVariables.BooterConfig != 0) {
SetNvramVariable(L"bootercfg", &gEfiAppleBootGuid, Attributes, sizeof(gSettings.RtVariables.BooterConfig), &gSettings.RtVariables.BooterConfig);
}
*/
if ( gSettings.RtVariables.BooterCfgStr.notEmpty() ) { if ( gSettings.RtVariables.BooterCfgStr.notEmpty() ) {
SetNvramXString8(L"bootercfg", gEfiAppleBootGuid, Attributes, gSettings.RtVariables.BooterCfgStr); SetNvramXString8(L"bootercfg", gEfiAppleBootGuid, Attributes, gSettings.RtVariables.BooterCfgStr);
} else { } else {

2
rEFIt_UEFI/Settings/ConfigManager.cpp
View File

@ -342,7 +342,7 @@ void ConfigManager::DiscoverDevices()
} }
// //
// Get MAC-address from hardwaredirectly // Get MAC-address from hardware directly
// //
if ( Mmio != NULL ) { if ( Mmio != NULL ) {
UINTN Offset = 0; UINTN Offset = 0;