Introduce a new Guid with CName gEfiGenericPlatformVariableGuid to pair with those Unicode String names, which are forbidden to pair with gEfiGlobalVariableGuid according to newest Uefi Spec.

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

4 files changed, 44 insertions, 10 deletions

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index db8be51a64..2dee05c2b7 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -7,11 +7,11 @@
     <Abstract>Edk Module Package Reference Implementations</Abstract>

     <Description>This Module provides standard reference information for EFI/Tiano implementations.</Description>

     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>

-    <License>All rights reserved.

-      This program and the accompanying materials are licensed and made available 

-      under the terms and conditions of the BSD License which accompanies this distribution.

-      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES

+    <License>All rights reserved.
+      This program and the accompanying materials are licensed and made available 
+      under the terms and conditions of the BSD License which accompanies this distribution.
+      The full text of the license may be found at http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES
       OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </SpdHeader>

@@ -452,7 +452,7 @@
     <Entry Name="GenericPlatformTokenSpace">

       <C_Name>gEfiGenericPlatformTokenSpaceGuid</C_Name>

       <GuidValue>18D15EA6-9E14-40a1-B39C-59C44DA9D891</GuidValue>

-      <HelpText>This is the token space GUID for platform generic PCD definitions.

+      <HelpText>This is the token space GUID for platform generic PCD definitions.
         Now FlashLayout and Platform CPU belong to this space.</HelpText>

     </Entry>

     <Entry Name="EdkModulePkgTokenSpace">

@@ -640,6 +640,11 @@
       <GuidValue>060CC026-4C0D-4DDA-8F41-595FEF00A502</GuidValue>

       <HelpText/>

     </Entry>

+    <Entry Name="GenericPlatformVariable" GuidTypeList="EFI_VARIABLE">

+      <C_Name>gEfiGenericPlatformVariableGuid</C_Name>

+      <GuidValue>59d1c24f-50f1-401a-b101-f33e0daed443</GuidValue>

+      <HelpText>The variable space Guid to pair with a Unicode string name to tag an EFI variable</HelpText>

+    </Entry>

   </GuidDeclarations>

   <ProtocolDeclarations>

     <Entry Name="Capsule">

@@ -903,7 +908,7 @@
       <DatumType>UINT32</DatumType>

       <ValidUsage>FIXED_AT_BUILD</ValidUsage>

       <DefaultValue>0x08</DefaultValue>

-      <HelpText>The maximum number of callback function, which will be triggered when 

+      <HelpText>The maximum number of callback function, which will be triggered when 
         a PCD entry is been set, can be registered for a single PCD entry in PEI phase.</HelpText>

     </PcdEntry>

     <PcdEntry>

@@ -913,7 +918,7 @@
       <DatumType>UINT32</DatumType>

       <ValidUsage>FIXED_AT_BUILD</ValidUsage>

       <DefaultValue>0x0</DefaultValue>

-      <HelpText>The base address of the VPD (Vital Product Data) region. It is 

+      <HelpText>The base address of the VPD (Vital Product Data) region. It is 
         normally a region reserved on flash.</HelpText>

     </PcdEntry>

     <PcdEntry>

@@ -950,7 +955,7 @@
       <DatumType>BOOLEAN</DatumType>

       <ValidUsage>FEATURE_FLAG</ValidUsage>

       <DefaultValue>TRUE</DefaultValue>

-      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database 

+      <HelpText>This feature flag can be used to enable or disable the Pcd PEIM database 
         traverse capability. Disable it can reduce the size of final image generated.</HelpText>

     </PcdEntry>

     <PcdEntry>

@@ -960,7 +965,7 @@
       <DatumType>BOOLEAN</DatumType>

       <ValidUsage>FEATURE_FLAG</ValidUsage>

       <DefaultValue>TRUE</DefaultValue>

-      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database 

+      <HelpText>This feature flag can be used to enable or disable the Pcd DXE database 
         traverse capability. Disable it can reduce the size of final image generated.</HelpText>

     </PcdEntry>

     <PcdEntry>

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 2162937c65..7b5469b855 100644
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -58,6 +58,7 @@ Abstract:
 #include <Guid/CapsuleVendor.h>

 #include <Guid/CompatibleMemoryTested.h>

 #include <Guid/MemoryStatusCodeRecord.h>

+#include <Guid/GenericPlatformVariable.h>

 

 #include <Ppi/StatusCodeMemory.h>

 

diff --git a/EdkModulePkg/Include/EdkPeim.h b/EdkModulePkg/Include/EdkPeim.h
index a39ed5cdb4..e76d83df85 100644
--- a/EdkModulePkg/Include/EdkPeim.h
+++ b/EdkModulePkg/Include/EdkPeim.h
@@ -47,6 +47,7 @@ Abstract:
 #include <Guid/CapsuleVendor.h>

 #include <Guid/BootState.h>

 #include <Guid/MemoryStatusCodeRecord.h>

+#include <Guid/GenericPlatformVariable.h>

 

 #include <Ppi/PeiInMemory.h>

 #include <Ppi/FlashMap.h>

diff --git a/EdkModulePkg/Include/Guid/GenericPlatformVariable.h b/EdkModulePkg/Include/Guid/GenericPlatformVariable.h
new file mode 100644
index 0000000000..00ae375e59
--- /dev/null
+++ b/EdkModulePkg/Include/Guid/GenericPlatformVariable.h
@@ -0,0 +1,27 @@
+/*++

+

+Copyright (c) 2006, Intel Corporation                                                         

+All rights reserved. This program and the accompanying materials                          

+are licensed and made available under the terms and conditions of the BSD License         

+which accompanies this distribution.  The full text of the license may be found at        

+http://opensource.org/licenses/bsd-license.php                                            

+                                                                                          

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+

+Module Name:

+  

+  GenericPlatformVariable.h

+    

+Abstract:

+

+  The variable space Guid to pair with a Unicode string name to tag an EFI variable.

+

+--*/

+

+#ifndef _GENERIC_PLATFORM_VARIABLE_H_

+#define _GENERIC_PLATFORM_VARIABLE_H_

+

+extern EFI_GUID gEfiGenericPlatformVariableGuid;

+

+#endif