Cleanup MdePkg.dsc, UefiLib.inf and UefiLib.msa

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

diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index b38f2b77edaddbab8331658ef0d51c4d7a978b32..1b218a42cb95ed464d1aa7bdf3cf8fe560e7077d 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -2,8 +2,8 @@
 # Component description file for the entry point to a EFIDXE Drivers\r
 #\r
 # Library to abstract Framework extensions that conflict with UEFI 2.0 Specification\r
 # Component description file for the entry point to a EFIDXE Drivers\r
 #\r
 # Library to abstract Framework extensions that conflict with UEFI 2.0 Specification\r

-# \r
-#  Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts with library functions and supporting implementations of the old \r
+#\r
+#  Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts with library functions and supporting implementations of the old\r

 #  (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as it contains DXE enum extensions for EFI event services.\r
 # Copyright (c) 2007, Intel Corporation.\r
 #\r
 #  (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as it contains DXE enum extensions for EFI event services.\r
 # Copyright (c) 2007, Intel Corporation.\r
 #\r


@@ -28,7 +28,7 @@
   FILE_GUID                      = 3a004ba5-efe0-4a61-9f1a-267a46ae5ba9\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 3a004ba5-efe0-4a61-9f1a-267a46ae5ba9\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = UefiLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER \r
+  LIBRARY_CLASS                  = UefiLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r


@@ -98,7 +98,6 @@
 ################################################################################\r
 \r
 [Guids]\r
 ################################################################################\r
 \r
 [Guids]\r

-  gEfiFrameworkDevicePathGuid                   # ALWAYS_CONSUMED\r

   gEfiEventReadyToBootGuid                      # ALWAYS_CONSUMED\r
   gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED\r
 \r
   gEfiEventReadyToBootGuid                      # ALWAYS_CONSUMED\r
   gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED\r
 \r

diff --git a/MdePkg/Library/UefiLib/UefiLib.msa b/MdePkg/Library/UefiLib/UefiLib.msa
index 19b5703a3fa243adccb4e05a4ee0ac62ca576cf1..b6693d4854dc10ef55ffea7bb3bf07bc56ade8f4 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLib.msa
+++ b/MdePkg/Library/UefiLib/UefiLib.msa
@@ -8,7 +8,7 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification
 
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>\r
     <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification
 

- Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts with library functions and supporting implementations of the old 
+ Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts with library functions and supporting implementations of the old

  (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as  it contains DXE enum extensions for EFI event services.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials
  (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as  it contains DXE enum extensions for EFI event services.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation.</Copyright>\r
     <License>All rights reserved. This program and the accompanying materials


@@ -66,9 +66,6 @@
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiEventReadyToBootGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
       <GuidCName>gEfiEventReadyToBootGuid</GuidCName>\r
     </GuidCNames>\r

-    <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>gEfiFrameworkDevicePathGuid</GuidCName>\r
-    </GuidCNames>\r

   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
   </Guids>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 8bda30b4008931631a03c3c6ec28425507c52244..5914b05d7d0b64435e4a438e26799c4632c34bf9 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -31,6 +31,10 @@
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 \r
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 \r

+################################################################################\r
+#\r
+# Pcd Section - list of all EDK II PCD Entries defined by this Platform\r
+#\r

 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r