diff options
| author | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-10 12:53:36 +0000 |
|---|---|---|
| committer | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-10 12:53:36 +0000 |
| commit | af1b10362dd41b88cb15c91953e986881a6387e6 (patch) | |
| tree | 23b9d22ccf41f60fbba21ce55fd2b4cc31ce6ccc /EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib | |
| parent | ffe084ee76fc408ac3d77e5ce36ba12520d4900a (diff) | |
| download | edk2-platforms-af1b10362dd41b88cb15c91953e986881a6387e6.tar.xz | |
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
Diffstat (limited to 'EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib')
2 files changed, 7 insertions, 0 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h index 180400e511..2c5a3201e7 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h @@ -112,7 +112,9 @@ Abstract: // [BuildOptions]
// *_*_*_CC_FLAGS = /D PCD_EDKII_GLUE_PciExpressBaseAddress=0xC0000000
//
+#ifndef EDKII_GLUE_PciExpressBaseAddress
#define EDKII_GLUE_PciExpressBaseAddress PCD_EDKII_GLUE_PciExpressBaseAddress
+#endif
//
//
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h index f4bace19f4..e5a5489a15 100644 --- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h +++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h @@ -24,6 +24,11 @@ Abstract: #define __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB_H__
//
+// To avoid symbol collision with gRT in EfiDriverLib
+//
+#define gRT gGlueRT
+
+//
// Cached copy of the EFI Runtime Services Table
//
extern EFI_RUNTIME_SERVICES *gRT;
|