Introduce a new Guid with CName gEfiGenericPlatformVariableGuid to pair with those...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2145 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
index 3f648b7de6d43eb979b706cd3591758fdb51485b..c186fee9a39e12685b2156ffb86e00bb26246134 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
@@ -76,7 +76,7 @@ Returns:
     CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data);\r
     gRT->SetVariable (\r
           L"VBIOS",\r
     CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data);\r
     gRT->SetVariable (\r
           L"VBIOS",\r

-          &gEfiGlobalVariableGuid,\r
+          &gEfiGenericPlatformVariableGuid,\r

           EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
           sizeof (UINT8),\r
           &CallbackInfo->Data.VideoBIOS\r
           EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
           sizeof (UINT8),\r
           &CallbackInfo->Data.VideoBIOS\r


@@ -395,7 +395,7 @@ Returns:
   //\r
   VideoOption = BdsLibGetVariableAndSize (\r
                   L"VBIOS",\r
   //\r
   VideoOption = BdsLibGetVariableAndSize (\r
                   L"VBIOS",\r

-                  &gEfiGlobalVariableGuid,\r
+                  &gEfiGenericPlatformVariableGuid,\r

                   &VideoOptionSize\r
                   );\r
   if (NULL == VideoOption) {\r
                   &VideoOptionSize\r
                   );\r
   if (NULL == VideoOption) {\r

diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index 3508095ad78d8e89842c4f3f7a5d1049c479da9d..748340ddd2f457e78a21da31f56c988fe008c298 100644 (file)
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -212,6 +212,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
     </GuidCNames>\r

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>\r
+    </GuidCNames>\r

     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFlashMapHobGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiFlashMapHobGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index ae5b9f5ee50f994c0a5ea241ed5b230dcdf089ed..c2f8d5bd163169d09e633d0fdd005eec8beabced 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -105,6 +105,9 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiShellFileGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiShellFileGuid</GuidCName>\r
     </GuidCNames>\r

+    <GuidCNames Usage="ALWAYS_CONSUMED">\r
+      <GuidCName>gEfiGenericPlatformVariableGuid</GuidCName>\r
+    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c
index 4748ffca51eba00d3695d449d851065b872ccd5e..f0ac12e0d6ad53da64e4af640ed3f54c6991b863 100644 (file)
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/Performance.c
@@ -376,7 +376,7 @@ Done:
 \r
   gRT->SetVariable (\r
         L"PerfDataMemAddr",\r
 \r
   gRT->SetVariable (\r
         L"PerfDataMemAddr",\r

-        &gEfiGlobalVariableGuid,\r
+        &gEfiGenericPlatformVariableGuid,\r

         EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
         sizeof (UINT32),\r
         (VOID *) &mAcpiLowMemoryBase\r
         EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
         sizeof (UINT32),\r
         (VOID *) &mAcpiLowMemoryBase\r