From a54f035f543cad1dc577097a619823b1ee4e7610 Mon Sep 17 00:00:00 2001
From: Mike Beaton <mjsbeaton@gmail.com>
Date: Fri, 16 Dec 2022 06:10:07 +0000
Subject: [PATCH] ocvalidate: Allow same tool with different nvram access

---
 Changelog.md                        | 1 +
 Utilities/ocvalidate/ValidateMisc.c | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ef2b2a7d..3eb40133 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ OpenCore Changelog
 - Updated underlying EDK II package to edk2-stable202211
 - Updated AppleKeyboardLayouts.txt from macOS 13.1
 - Updated builtin firmware versions for SMBIOS and the rest
+- Updated ocvalidate to allow duplicate tool if FullNvramAccess is different
 
 #### v0.8.7
 - Removed unwanted clear screen when launching non-text boot entry
diff --git a/Utilities/ocvalidate/ValidateMisc.c b/Utilities/ocvalidate/ValidateMisc.c
index c9caa77c..b8a226fa 100644
--- a/Utilities/ocvalidate/ValidateMisc.c
+++ b/Utilities/ocvalidate/ValidateMisc.c
@@ -89,6 +89,8 @@ MiscToolsHasDuplication (
   CONST CHAR8                *MiscToolsSecondaryArgumentsString;
   CONST CHAR8                *MiscToolsPrimaryPathString;
   CONST CHAR8                *MiscToolsSecondaryPathString;
+  BOOLEAN                    MiscToolsPrimaryFullNvramAccess;
+  BOOLEAN                    MiscToolsSecondaryFullNvramAccess;
 
   MiscToolsPrimaryEntry             = *(CONST OC_MISC_TOOLS_ENTRY **)PrimaryEntry;
   MiscToolsSecondaryEntry           = *(CONST OC_MISC_TOOLS_ENTRY **)SecondaryEntry;
@@ -96,13 +98,16 @@ MiscToolsHasDuplication (
   MiscToolsSecondaryArgumentsString = OC_BLOB_GET (&MiscToolsSecondaryEntry->Arguments);
   MiscToolsPrimaryPathString        = OC_BLOB_GET (&MiscToolsPrimaryEntry->Path);
   MiscToolsSecondaryPathString      = OC_BLOB_GET (&MiscToolsSecondaryEntry->Path);
+  MiscToolsPrimaryFullNvramAccess   = MiscToolsPrimaryEntry->FullNvramAccess;
+  MiscToolsSecondaryFullNvramAccess = MiscToolsSecondaryEntry->FullNvramAccess;
 
   if (!MiscToolsPrimaryEntry->Enabled || !MiscToolsSecondaryEntry->Enabled) {
     return FALSE;
   }
 
   if (  (AsciiStrCmp (MiscToolsPrimaryArgumentsString, MiscToolsSecondaryArgumentsString) == 0)
-     && (AsciiStrCmp (MiscToolsPrimaryPathString, MiscToolsSecondaryPathString) == 0))
+     && (AsciiStrCmp (MiscToolsPrimaryPathString, MiscToolsSecondaryPathString) == 0)
+     && MiscToolsPrimaryFullNvramAccess == MiscToolsSecondaryFullNvramAccess)
   {
     DEBUG ((DEBUG_WARN, "Misc->Tools->Path: %a is duplicated ", MiscToolsPrimaryPathString));
     return TRUE;
-- 
GitLab