diff --git a/Clover.dsc b/Clover.dsc index 8fab438e3..62fb34df2 100644 --- a/Clover.dsc +++ b/Clover.dsc @@ -24,7 +24,9 @@ SUPPORTED_ARCHITECTURES = X64|IA32 BUILD_TARGETS = RELEASE|DEBUG SKUID_IDENTIFIER = DEFAULT +!ifndef SKIP_FLASH FLASH_DEFINITION = Clover.fdf +!endif !ifndef OPENSSL_VERSION DEFINE OPENSSL_VERSION = 1.0.1e diff --git a/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist b/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist index e33a6df3f..765a79857 100644 --- a/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist +++ b/CloverPackage/CloverV2/EFI/CLOVER/config-sample.plist @@ -271,6 +271,19 @@ 0x3E7 MLB C02032109R5DC771H + Block + + + Disabled + + Comment + Dell variables + UUID + FF2E9FC7-D16F-434A-A24E-C99519B7EB93 + Name + * + + CPU diff --git a/Protocols/DumpUefiCalls/DumpUefiCalls.dsc b/Protocols/DumpUefiCalls/DumpUefiCalls.dsc index 1557f97dd..2454e3d87 100644 --- a/Protocols/DumpUefiCalls/DumpUefiCalls.dsc +++ b/Protocols/DumpUefiCalls/DumpUefiCalls.dsc @@ -43,7 +43,7 @@ UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf [Components] - Clover/DumpUefiCalls/DumpUefiCalls.inf + Protocols/DumpUefiCalls/DumpUefiCalls.inf [PcdsFixedAtBuild] diff --git a/rEFIt_UEFI/Platform/Settings.c b/rEFIt_UEFI/Platform/Settings.c index aa606f9ee..259918f51 100644 --- a/rEFIt_UEFI/Platform/Settings.c +++ b/rEFIt_UEFI/Platform/Settings.c @@ -6179,6 +6179,18 @@ GetUserSettings( if (Prop != NULL && AsciiStrLen (Prop->string) > 0) { AsciiStrCpyS (gSettings.BooterCfgStr, 64, Prop->string); } + + Prop = GetProperty (DictPointer, "Block"); + if (Prop != NULL) { + INTN i, Count = GetTagCount (Prop); + for (i = 0; i < Count; i++) { + EFI_STATUS Status = GetElement (Prop, i, &Dict); + if (!EFI_ERROR(Status)) { + Prop2 = GetProperty (Dict, "Comment"); + } + } + } + } if (gSettings.RtROM == NULL) {