1) Use FeatureFlag PcdPciBusHotplugDeviceSupport to merge LightPciLib.c with PcdLib.c.

2) Correct some minor bugs: when invoking gRT->GetVariable the Attributes field can be optianal.

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

1 files changed, 19 insertions, 10 deletions

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index e63427f955..db8be51a64 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">

@@ -903,7 +903,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 +913,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 +950,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 +960,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>

@@ -1260,5 +1260,14 @@
       <DefaultValue>FALSE</DefaultValue>

       <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>

     </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>

+      <Token>0x0001003d</Token>

+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>BOOLEAN</DatumType>

+      <ValidUsage>FEATURE_FLAG</ValidUsage>

+      <DefaultValue>TRUE</DefaultValue>

+      <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>

+    </PcdEntry>

   </PcdDeclarations>

 </PackageSurfaceArea>
\ No newline at end of file