Remove EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID definition from MdeModulePkg, because...

And, keep its definition into MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr to let VFR file consume it.

Signed-off-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12395 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Include/Guid/DriverSampleHii.h b/MdeModulePkg/Include/Guid/DriverSampleHii.h
index 01c571fcd5c6e9beccdedb63fe7cf15f18a072de..b5e1dbc0999438667d362f1e1cb3ec6625a0b26d 100644 (file)
--- a/MdeModulePkg/Include/Guid/DriverSampleHii.h
+++ b/MdeModulePkg/Include/Guid/DriverSampleHii.h
@@ -25,9 +25,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     0xb3f56470, 0x6141, 0x4621, {0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8} \\r
   }\r
 \r
-#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \\r
-  { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }\r
-\r
 #define EFI_IFR_REFRESH_ID_OP_GUID \\r
   { \\r
     0xF5E655D9, 0x02A6, 0x46f2, {0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22} \\r
@@ -35,7 +32,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 extern EFI_GUID gDriverSampleFormSetGuid;\r
 extern EFI_GUID gDriverSampleInventoryGuid;\r
-extern EFI_GUID gEfiUserInfoAccessSetupAdminGuid;\r
 extern EFI_GUID gEfiIfrRefreshIdOpGuid;\r
 \r
 #endif\r

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 409729273304932af8b10bcf87b9e71e80ef692e..f9a19f9fdc63d8d3295f02d8c4ffc45c6349a55d 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -216,7 +216,6 @@
   ## Include/Guid/DriverSampleHii.h\r
   gDriverSampleFormSetGuid           = { 0xA04A27f4, 0xDF00, 0x4D42, { 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D }}\r
   gDriverSampleInventoryGuid         = { 0xb3f56470, 0x6141, 0x4621, { 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 }}\r
-  gEfiUserInfoAccessSetupAdminGuid   = { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee }}\r
   gEfiIfrRefreshIdOpGuid             = { 0xF5E655D9, 0x02A6, 0x46f2, { 0x9E, 0x76, 0xB8, 0xBE, 0x8E, 0x60, 0xAB, 0x22 }}\r
 \r
   ## Include/Guid/PlatDriOverrideHii.h\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 78c93d0ebff3a4bb7495f559d4267781d25c415d..cedb665fe6a78deb552f7442044a7cdd588de7eb 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -43,6 +43,9 @@
 #define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004\r
 #define EFI_VARIABLE_READ_ONLY          0x00000008\r
 \r
+#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \\r
+  { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }\r
+\r
 //\r
 // Labels definition\r
 //\r