1. Rename gRT in GlueLib to avoid collision with EfiDriverLib

2. Add the extra parameter of PciCfg in the new PeiLibPciCfgModify() to keep the parameter list the same as the PciCfg->Modify(). PciCfg is just a place holder.
3. Allow platform develop to set EDKII_GLUE_PciExpressBaseAddress value in build option.

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

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
index 180400e5116e32dbaed87e28efbc5ac87e7dff98..2c5a3201e75968de359f902219c4290c6e7c5ea3 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
@@ -112,7 +112,9 @@ Abstract:
 // [BuildOptions]\r
 //   *_*_*_CC_FLAGS = /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xC0000000\r
 //\r
+#ifndef EDKII_GLUE_PciExpressBaseAddress\r
 #define EDKII_GLUE_PciExpressBaseAddress        PCD_EDKII_GLUE_PciExpressBaseAddress\r
+#endif\r
 \r
 //\r
 //\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h
index f4bace19f4e6069f1e413d68876e1679b70a4cff..e5a5489a15074badff8bd29d4f03f851ae59a3d1 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h
@@ -23,6 +23,11 @@ Abstract:
 #ifndef __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB_H__\r
 #define __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB_H__\r
 \r
+//\r
+// To avoid symbol collision with gRT in EfiDriverLib\r
+//\r
+#define gRT                  gGlueRT\r
+\r
 //\r
 // Cached copy of the EFI Runtime Services Table\r
 //\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h b/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h
index e3afb4341f4a2ae1bfd85872c0b76c61eff977a0..24090b65d479c2be355573400e48ca18348d0835 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/Include/PeiLib.h
@@ -1307,6 +1307,7 @@ EFI_STATUS
 EFIAPI \r
 PeiLibPciCfgModify (\r
   IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN PEI_PCI_CFG_PPI          *PciCfg,\r
   IN PEI_PCI_CFG_PPI_WIDTH    Width,\r
   IN UINT64                   Address,\r
   IN UINTN                    SetBits,\r
@@ -1337,6 +1338,7 @@ Routine Description:
    it will be updated to the following code which call this library API:\r
       PeiLibPciCfgModify (\r
           PeiServices,\r
+          PciCfg,\r
           Width,\r
           Address,\r
           SetBits,\r
@@ -1349,7 +1351,9 @@ Arguments:
   \r
   PeiServices     An indirect pointer to the PEI Services Table\r
                           published by the PEI Foundation.\r
-\r
+  PciCfg          A pointer to the this pointer of EFI_PEI_PCI_CFG_PPI. \r
+                          This parameter is unused as a place holder to make\r
+                          the parameter list identical to PEI_PCI_CFG_PPI_RW.\r
   Width           The width of the access. Enumerated in bytes. Type\r
                           EFI_PEI_PCI_CFG_PPI_WIDTH is defined in Read().\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
index 86fbbb1ecdc8a4d54e6810599736eb772bf681da..8c81c478fc593014b2b2c5d0c51e1bbbc22211cf 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeiLib.c
@@ -157,6 +157,7 @@ EFI_STATUS
 EFIAPI \r
 PeiLibPciCfgModify (\r
   IN EFI_PEI_SERVICES         **PeiServices,\r
+  IN PEI_PCI_CFG_PPI          *PciCfg,\r
   IN PEI_PCI_CFG_PPI_WIDTH    Width,\r
   IN UINT64                   Address,\r
   IN UINTN                    SetBits,\r
@@ -187,6 +188,7 @@ Routine Description:
    it will be updated to the following code which call this library API:\r
       PeiLibPciCfgModify (\r
           PeiServices,\r
+          PciCfg,\r
           Width,\r
           Address,\r
           SetBits,\r
@@ -199,7 +201,9 @@ Arguments:
   \r
   PeiServices     An indirect pointer to the PEI Services Table\r
                           published by the PEI Foundation.\r
-\r
+  PciCfg          A pointer to the this pointer of EFI_PEI_PCI_CFG_PPI. \r
+                          This parameter is unused as a place holder to make\r
+                          the parameter list identical to PEI_PCI_CFG_PPI_RW.\r
   Width           The width of the access. Enumerated in bytes. Type\r
                           EFI_PEI_PCI_CFG_PPI_WIDTH is defined in Read().\r
 \r