From af1b10362dd41b88cb15c91953e986881a6387e6 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Wed, 10 Sep 2008 12:53:36 +0000 Subject: 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 --- .../Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h | 2 ++ .../Include/Library/EdkIIGlueUefiRuntimeServicesTableLib.h | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib') 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 @@ -23,6 +23,11 @@ Abstract: #ifndef __EDKII_GLUE_UEFI_RUNTIME_SERVICES_TABLE_LIB_H__ #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 // -- cgit v1.2.3