Remove INF/MSA file name to align with directory name

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

diff --git a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
new file mode 100644 (file)
index 0000000..42a19f5
--- /dev/null
+++ b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
@@ -0,0 +1,48 @@
+#/** @file\r
+#  Base Debug library instance base on Serial Port library.\r
+#  It uses PrintLib to send debug messages to serial port device.\r
+#\r
+#  Copyright (c) 2006 - 2008, Intel Corporation.\r
+#\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
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = BaseDebugLibSerialPort\r
+  FILE_GUID                      = BB83F95F-EDBC-4884-A520-CD42AF388FAE\r
+  MODULE_TYPE                    = BASE\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = DebugLib \r
+  EDK_RELEASE_VERSION            = 0x00020000\r
+  EFI_SPECIFICATION_VERSION      = 0x00020000\r
+\r
+#\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#\r
+\r
+[Sources.common]\r
+  DebugLib.c\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+\r
+[LibraryClasses]\r
+  SerialPortLib\r
+  BaseMemoryLib\r
+  PcdLib\r
+  PrintLib\r
+  BaseLib\r
+\r
+[Pcd.common]\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
+\r

diff --git a/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa
new file mode 100644 (file)
index 0000000..6187447
--- /dev/null
+++ b/MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.msa
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <MsaHeader>\r
+    <ModuleName>BaseDebugLibSerialPort</ModuleName>\r
+    <ModuleType>BASE</ModuleType>\r
+    <GuidValue>BB83F95F-EDBC-4884-A520-CD42AF388FAE</GuidValue>\r
+    <Version>1.0</Version>\r
+    <Abstract>Debug Library for UEFI drivers</Abstract>\r
+    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
+    <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>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>DxeDebugLibSerialPort</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <LibraryClassDefinitions>\r
+    <LibraryClass Usage="ALWAYS_PRODUCED">\r
+      <Keyword>DebugLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>PrintLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>PcdLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseMemoryLib</Keyword>\r
+    </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>SerialPortLib</Keyword>\r
+    </LibraryClass>\r
+  </LibraryClassDefinitions>\r
+  <SourceFiles>\r
+    <Filename>DebugLib.c</Filename>\r
+  </SourceFiles>\r
+  <PackageDependencies>\r
+    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
+  </PackageDependencies>\r
+  <Externs>\r
+    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
+    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
+  </Externs>\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+      <C_Name>PcdDebugPropertyMask</C_Name>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>The bitmask of flags that specify the enable/disable of Debug
+                Assert, Debug Print, Debug Code, Clear Memory, Assert
+                Breakpoint and Assert Deadloop.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>The value used by DebugClearMemory () to fill a certain range
+                of memory.</HelpText>\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r
+      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
+      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <HelpText>The bitmask of flags that specify the kind of debug message
+                output when Debug Print is enabled.</HelpText>\r
+    </PcdEntry>\r
+  </PcdCoded>\r
+</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
deleted file mode 100644 (file)
index 42a19f5..0000000
--- a/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf
+++ /dev/null
@@ -1,48 +0,0 @@
-#/** @file\r
-#  Base Debug library instance base on Serial Port library.\r
-#  It uses PrintLib to send debug messages to serial port device.\r
-#\r
-#  Copyright (c) 2006 - 2008, Intel Corporation.\r
-#\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
-#\r
-#\r
-#**/\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = BaseDebugLibSerialPort\r
-  FILE_GUID                      = BB83F95F-EDBC-4884-A520-CD42AF388FAE\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = DebugLib \r
-  EDK_RELEASE_VERSION            = 0x00020000\r
-  EFI_SPECIFICATION_VERSION      = 0x00020000\r
-\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
-#\r
-\r
-[Sources.common]\r
-  DebugLib.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-\r
-[LibraryClasses]\r
-  SerialPortLib\r
-  BaseMemoryLib\r
-  PcdLib\r
-  PrintLib\r
-  BaseLib\r
-\r
-[Pcd.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue\r
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask\r
-\r

diff --git a/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa b/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa
deleted file mode 100644 (file)
index 6187447..0000000
--- a/MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.msa
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-  <MsaHeader>\r
-    <ModuleName>BaseDebugLibSerialPort</ModuleName>\r
-    <ModuleType>BASE</ModuleType>\r
-    <GuidValue>BB83F95F-EDBC-4884-A520-CD42AF388FAE</GuidValue>\r
-    <Version>1.0</Version>\r
-    <Abstract>Debug Library for UEFI drivers</Abstract>\r
-    <Description>Library to abstract Framework extensions that conflict with UEFI 2.0 Specification</Description>\r
-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>\r
-    <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>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
-  </MsaHeader>\r
-  <ModuleDefinitions>\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
-    <BinaryModule>false</BinaryModule>\r
-    <OutputFileBasename>DxeDebugLibSerialPort</OutputFileBasename>\r
-  </ModuleDefinitions>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_PRODUCED">\r
-      <Keyword>DebugLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PrintLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>PcdLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseMemoryLib</Keyword>\r
-    </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>SerialPortLib</Keyword>\r
-    </LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename>DebugLib.c</Filename>\r
-  </SourceFiles>\r
-  <PackageDependencies>\r
-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
-  </PackageDependencies>\r
-  <Externs>\r
-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
-  </Externs>\r
-  <PcdCoded>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugPropertyMask</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
-                Breakpoint and Assert Deadloop.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
-                of memory.</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry PcdItemType="DYNAMIC">\r
-      <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-      <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText>The bitmask of flags that specify the kind of debug message
-                output when Debug Print is enabled.</HelpText>\r
-    </PcdEntry>\r
-  </PcdCoded>\r
-</ModuleSurfaceArea>
\ No newline at end of file

diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 6a0a2f9e29d9f40ef36981116ff6a09552c6d292..6e33f8a822f27f17165578fb55a1c66fb293b251 100644 (file)
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -67,6 +67,7 @@
   MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
   MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
   MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
+  MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
   MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf\r
   MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
   MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
@@ -101,7 +102,6 @@
   MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
   MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
   MdePkg/Library/DxeMemoryLib/DxeMemoryLib.inf\r
-  MdePkg/Library/BaseDebugLibSerialPort/DxeDebugLibSerialPort.inf\r
   MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
   MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf\r