git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@419 6f19259b...

diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd
index d486d631658136c180d8ac420baff56b6635f649..c4dfccb97ed1c840d958c77f95b090ce61499d87 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd
+++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Undi.mbd
@@ -1,47 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">\r
-  <MbdHeader>\r
-    <BaseName>Undi</BaseName>\r
-    <Guid>A1f436EA-A127-4EF8-957C-8048606FF670</Guid>\r
-    <Version>0</Version>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
-    <License>\r
-      All rights reserved. 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
-      http://opensource.org/licenses/bsd-license.php\r
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-    </License>\r
-    <Created>2006-03-12 17:09</Created>\r
-    <Modified>2006-03-19 15:18</Modified>\r
-  </MbdHeader>\r
-  <Libraries>\r
-    <Library>UefiBootServicesTableLib</Library>\r
-    <Library>BaseLib</Library>\r
-    <Library>BaseMemoryLib</Library>\r
-    <Library>UefiLib</Library>\r
-    <Library>UefiDriverEntryPoint</Library>\r
-    <Library>DxeReportStatusCodeLib</Library>\r
-    <Library>BaseDebugLibNull</Library>\r
-    <Library>BasePrintLib</Library>\r
-    <Library>EdkDxeRuntimeDriverLib</Library>\r
-    <Library>UefiDriverModelLib</Library>\r
-    <Library>DxeHobLib</Library>\r
-    <Library>DxeMemoryAllocationLib</Library>\r
-    <Arch ArchType="IPF">\r
-      <Library>EdkDxeSalLib</Library>\r
-    </Arch>\r
-  </Libraries>\r
-</ModuleBuildDescription>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution.  The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+-->
+<ModuleBuildDescription xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd">
+  <MbdHeader>
+    <BaseName>Undi</BaseName>
+    <Guid>A1f436EA-A127-4EF8-957C-8048606FF670</Guid>
+    <Version>0</Version>
+    <Description>FIX ME!</Description>
+    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>
+    <License>
+      All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <Created>2006-03-12 17:09</Created>
+    <Modified>2006-03-19 15:18</Modified>
+  </MbdHeader>
+  <Libraries>
+    <Library>UefiBootServicesTableLib</Library>
+    <Library>BaseLib</Library>
+    <Library>BaseMemoryLib</Library>
+    <Library>UefiLib</Library>
+    <Library>UefiDriverEntryPoint</Library>
+    <Library>DxeReportStatusCodeLib</Library>
+    <Library>BaseDebugLibReportStatusCode</Library>
+    <Library>EdkDxeRuntimeDriverLib</Library>
+    <Library>UefiDriverModelLib</Library>
+    <Library>DxeHobLib</Library>
+    <Library>DxeMemoryAllocationLib</Library>
+    <Arch ArchType="IPF">
+      <Library>EdkDxeSalLib</Library>
+    </Arch>
+  </Libraries>
+</ModuleBuildDescription>

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
index c77f09b9769ca97e41a7a292a9a4d17776414234..f9e28861c5f34a15a03b55e2c7693eea46e9fd6b 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/DriverSample/DriverSample.mbd
@@ -31,11 +31,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>UefiBootServicesTableLib</Library>\r
     <Library>UefiRuntimeServicesTableLib</Library>\r
     <Library>BaseLib</Library>\r
-    <Library>BaseMemoryLib</Library>\r
+    <Library>UefiMemoryLib</Library>\r
     <Library>UefiLib</Library>\r
     <Library>UefiDriverEntryPoint</Library>\r
     <Library>DxeReportStatusCodeLib</Library>\r
-    <Library>BaseDebugLibNull</Library>\r
+    <Library>BaseDebugLibReportStatusCode</Library>\r
     <Library>BasePrintLib</Library>\r
     <Library>EdkGraphicsLib</Library>\r
     <Library>EdkIfrSupportLib</Library>\r

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
index 6a3eec14b18cd8c272a1f14ea7f2593426ee6373..6dc2e361387dd0ab94af6bbbb14b5acb73a65588 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.mbd
@@ -31,13 +31,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>UefiBootServicesTableLib</Library>\r
     <Library>UefiRuntimeServicesTableLib</Library>\r
     <Library>BaseLib</Library>\r
-    <Library>BaseDebugLibNull</Library>    \r
-    <Library>BaseMemoryLib</Library>\r
+    <Library>DxeReportStatusCodeLib</Library>\r
+    <Library>BaseDebugLibReportStatusCode</Library>\r
+    <Library>UefiMemoryLib</Library>\r
     <Library>BasePrintLib</Library>\r
     <Library>UefiDriverEntryPoint</Library>\r
     <Library>DxeMemoryAllocationLib</Library>\r
     <Library>EdkGraphicsLib</Library>\r
-    <Library>DxeReportStatusCodeLib</Library>\r
     <Library>HiiLib</Library>\r
   </Libraries>\r
 </ModuleBuildDescription>\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
index 6a5be9d885a85eab406da743779ab3071e85b80c..7f2ea440e8b089b91fca2bced042c43dd3ad31e1 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.mbd
@@ -35,8 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Library>UefiDriverEntryPoint</Library>\r
     <Library>DxeReportStatusCodeLib</Library>\r
     <Library>DxeServicesTableLib</Library>\r
-    <Library>BaseDebugLibNull</Library>\r
-    <Library>BasePrintLib</Library>\r
+    <Library>BaseDebugLibReportStatusCode</Library>\r
     <Library>EdkDxeRuntimeDriverLib</Library>\r
     <Library>DxeHobLib</Library>\r
     <Library>DxeMemoryAllocationLib</Library>\r