diff --git a/Clover.dsc b/Clover.dsc index 247fdf888..eb56897e2 100644 --- a/Clover.dsc +++ b/Clover.dsc @@ -594,7 +594,7 @@ } MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - #MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf #MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf #MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf diff --git a/Clover.fdf b/Clover.fdf index f04c3abfb..5b66c6620 100644 --- a/Clover.fdf +++ b/Clover.fdf @@ -91,7 +91,7 @@ INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.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 CloverEFI/GraphicsConsoleDxe/GraphicsConsoleDxe.inf diff --git a/rEFIt_UEFI/Platform/DataHubCpu.cpp b/rEFIt_UEFI/Platform/DataHubCpu.cpp index 2914ad156..025d67906 100644 --- a/rEFIt_UEFI/Platform/DataHubCpu.cpp +++ b/rEFIt_UEFI/Platform/DataHubCpu.cpp @@ -397,17 +397,14 @@ SetVariablesForOSX(LOADER_ENTRY *Entry) } 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); + SetNvramVariable(L"BridgeOSBootSessionUUID", gEfiAppleBootGuid, Attributes, sizeof(uuid), &uuid); } else { 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() ) { SetNvramXString8(L"bootercfg", gEfiAppleBootGuid, Attributes, gSettings.RtVariables.BooterCfgStr); } else { diff --git a/rEFIt_UEFI/Settings/ConfigManager.cpp b/rEFIt_UEFI/Settings/ConfigManager.cpp index 31f4ebdd5..aff13db05 100644 --- a/rEFIt_UEFI/Settings/ConfigManager.cpp +++ b/rEFIt_UEFI/Settings/ConfigManager.cpp @@ -342,7 +342,7 @@ void ConfigManager::DiscoverDevices() } // - // Get MAC-address from hardwaredirectly + // Get MAC-address from hardware directly // if ( Mmio != NULL ) { UINTN Offset = 0;