ocvalidate: Require LoadEarly=FALSE on OpenRuntime when OpenVariableRuntimeDxe is not present; remove duplicate driver check
@@ -416,14 +416,6 @@ CheckUefiDrivers (
HasAudioDxeEfiDriver = TRUE;
IndexAudioDxeEfiDriver = Index;
}
-
- if (AsciiStrCmp (Driver, "OpenVariableRuntimeDxe.efi") == 0) {
- HasOpenVariableRuntimeDxeEfiDriver = TRUE;
-
- if (!DriverEntry->LoadEarly) {
- DEBUG ((DEBUG_WARN, "OpenVariableRuntimeDxe at UEFI->Drivers[%u] must have LoadEarly set to TRUE!\n", Index));
- }
- }
}
//
@@ -436,7 +428,8 @@ CheckUefiDrivers (
UefiDriverHasDuplication
);
- if (HasOpenVariableRuntimeDxeEfiDriver && HasOpenRuntimeEfiDriver) {
+ if (HasOpenRuntimeEfiDriver) {
+ if (HasOpenVariableRuntimeDxeEfiDriver) {
if (!IsOpenRuntimeLoadEarly) {
DEBUG ((
DEBUG_WARN,
@@ -456,6 +449,16 @@ CheckUefiDrivers (
));
++ErrorCount;
}
+ } else {
+ if (IsOpenRuntimeLoadEarly) {
+ DEBUG ((
+ DEBUG_WARN,
+ "OpenRuntime.efi at UEFI->Drivers[%u] should have its LoadEarly set to FALSE unless OpenVariableRuntimeDxe.efi is in use!\n",
+ IndexOpenRuntimeEfiDriver
+ ));
+ ++ErrorCount;
+ }
+ }
}
IsRequestBootVarRoutingEnabled = Config->Uefi.Quirks.RequestBootVarRouting;
