Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Include / EdkIIGlueConfig.h

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
index 2650379ba99c589f42ca392625b0388538f9ce80..3513f87d69f02a1956a5d526affb17a1d8bb7a2d 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2006, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -33,10 +33,15 @@ Abstract:
 //  0x6000  - support EBC. Feb, 2007\r
 //  0x7000  - size reduction, Jun, 2007\r
 //  0x7100  - backward compatibility supported, Jun, 2007\r
+//  0x8000  - Driver model protocols2 supported, May, 2008\r
+//  0x9000  - add SmmRuntimeDxeReportStatusCodeLib and OemHookStatusCodeLibNull, Feb, 2009\r
+//  0x9100  - change to use unique member RT variable names in various library instances, June, 2009\r
+//  0x9200  - Update LEGACY_BOOT and READY_TO_BOOT event handling in UefiLib, July, 2009\r
+//  0x9300  - Remove OemHookStatusCodeLibNull. SmmRuntimeDxeReportStatusCodeLib uses SMM StatusCode Protocol, Oct, 2009\r
 //\r
 //  For reference only, don't change the value\r
 //\r
-#define EDKII_GLUE_LIBRARY_VERSION 0x7100\r
+#define EDKII_GLUE_LIBRARY_VERSION 0x9300\r
 \r
 \r
 //\r
@@ -120,7 +125,9 @@ Abstract:
 // This value is FSB Clock frequency. Its unit is Hz and its \r
 // default value is 200000000, that means FSB frequency is 200Mhz.\r
 //\r
+#ifndef EDKII_GLUE_FSBClock\r
 #define EDKII_GLUE_FSBClock                     200000000\r
+#endif\r
 \r
 //\r
 // post code property mask\r
@@ -142,7 +149,9 @@ Abstract:
 // The base address of IPF IO Block\r
 //\r
 #ifdef MDE_CPU_IPF\r
+#ifndef EDKII_GLUE_IoBlockBaseAddressForIpf\r
 #define EDKII_GLUE_IoBlockBaseAddressForIpf     0x0ffffc000000\r
 #endif\r
+#endif\r
 \r
 #endif\r