DxeCore.h, PeiCis.h and Uefi.h should not include <Protocol/Pcd.h>. If a module need...

[mirror_edk2.git] / MdePkg / Include / Uefi.h

diff --git a/MdePkg/Include/Uefi.h b/MdePkg/Include/Uefi.h
index fcaaeb262cde70b243763d68bf0862b0a7db66d3..bb2599583f6b9af54a53b7c31ec4ed1dbb9405fe 100644 (file)
--- a/MdePkg/Include/Uefi.h
+++ b/MdePkg/Include/Uefi.h
@@ -5,8 +5,8 @@
   UEFI modules follow the public EFI 1.10 or UEFI 2.0 specifications and\r
   also contains the infrastructure required to build modules. The build \r
   infrastructure must set EFI_SPECIFICATION_VERSION  before including  this \r
-  file. To support R9/UEFI2.0 set EFI_SPECIFIATION_VERSION to 0x00020000. To \r
-  support R8.5/EFI 1.10 set EFI_SPECIFIATION_VERSION to 0x00010010. \r
+  file. To support EDK II/UEFI2.0 set EFI_SPECIFIATION_VERSION to 0x00020000. To \r
+  support EDK/EFI 1.10 set EFI_SPECIFIATION_VERSION to 0x00010010. \r
   Seting EDK_RELEASE_VERSION to zero implies no Tiano extensions and a\r
   non zero value implies Tiano extensions are availible. \r
   EFI_SPECIFIATION_VERSION and EDK_RELEASE_VERSION are set automatically\r
@@ -40,7 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // UEFI mode with no Tiano extensions is legal\r
 //\r
-#elif (EDK_RELEASE_VERSION <= 0x00080005) && (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+#elif (EDK_RELEASE_VERSION < 0x00020000) && (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
   #error Illegal combination of EFI_SPECIFICATION_VERSION and EDK_RELEASE_VERSION versions\r
 #endif\r
 \r
@@ -49,18 +49,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Common/UefiBaseTypes.h>\r
 #include <Uefi/UefiSpec.h>\r
 \r
-//\r
-// Need due to R8.5 Tiano contamination of UEFI enumes. \r
-// There is a UEFI library that does things the new way and the old way\r
-// This is why these definitions are need in Uefi.h\r
-//\r
-#include <Guid/EventLegacyBios.h>\r
-#include <Guid/FrameworkDevicePath.h>\r
-\r
-\r
-//\r
-// All module types types have access to PCD for build support\r
-//\r
-#include <Protocol/Pcd.h>\r
-\r
 #endif\r