AsmReadKr1 is already defined in the baselib

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

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
deleted file mode 100644 (file)
index 6f3155c..0000000
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
+++ /dev/null
@@ -1,47 +0,0 @@
-//++\r
-//\r
-// Copyright (c) 2006 Intel Corporation. All rights reserved\r
-// This software and associated documentation (if any) is furnished\r
-// under a license and may only be used or copied in accordance\r
-// with the terms of the license. Except as permitted by such\r
-// license, no part of this software or documentation may be\r
-// reproduced, stored in a retrieval system, or transmitted in any\r
-// form or by any means without the express written consent of\r
-// Intel Corporation.\r
-//\r
-//\r
-// Module Name:\r
-//\r
-//   ReadKr1.s\r
-//\r
-// Abstract:\r
-//\r
-//   Contains assembly code for read Kr1.\r
-//\r
-//--\r
-\r
-  .file  "ReadKr1.s"\r
-\r
-#include  "IpfMacro.i"\r
-\r
-//---------------------------------------------------------------------------------\r
-//++\r
-// AsmReadKr1\r
-//\r
-// This routine is used to get KR1. KR1 is used to store Pei Service Table\r
-// Pointer in archeture.\r
-//\r
-// Arguments : \r
-//\r
-// On Entry :  None.\r
-//\r
-// Return Value: Pei Services Table.\r
-// \r
-//--\r
-//----------------------------------------------------------------------------------\r
-PROCEDURE_ENTRY (AsmReadKr1)\r
-        \r
-        mov             r8 = ar.k1;;  // Pei Services Table Pointer\r
-        br.ret.dpnt     b0;;\r
-\r
-PROCEDURE_EXIT (AsmReadKr1)\r

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
deleted file mode 100644 (file)
index 48d276c..0000000
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
+++ /dev/null
@@ -1,48 +0,0 @@
-//++\r
-//\r
-// Copyright (c) 2006 Intel Corporation. All rights reserved\r
-// This software and associated documentation (if any) is furnished\r
-// under a license and may only be used or copied in accordance\r
-// with the terms of the license. Except as permitted by such\r
-// license, no part of this software or documentation may be\r
-// reproduced, stored in a retrieval system, or transmitted in any\r
-// form or by any means without the express written consent of\r
-// Intel Corporation.\r
-//\r
-//\r
-// Module Name:\r
-//\r
-//   WriteKr1.s\r
-//\r
-// Abstract:\r
-//\r
-//   Contains assembly code for write Kr1.\r
-//\r
-//--\r
-\r
-  .file  "WriteKr1.s"\r
-\r
-#include  "IpfMacro.i"\r
-\r
-//---------------------------------------------------------------------------------\r
-//++\r
-// AsmWriteKr1\r
-//\r
-// This routine is used to Write KR1. KR1 is used to store Pei Service Table\r
-// Pointer in archeture.\r
-//\r
-// Arguments : r32  Pei Services Table Pointer\r
-//\r
-// On Entry :  None.\r
-//\r
-// Return Value: None.\r
-// \r
-//--\r
-//----------------------------------------------------------------------------------\r
-PROCEDURE_ENTRY (AsmWriteKr1)\r
-        \r
-        mov             ar.k1 = r32;;  // Pei Services Table Pointer\r
-        br.ret.dpnt     b0;;\r
-\r
-PROCEDURE_EXIT (AsmWriteKr1)\r
- 
\ No newline at end of file

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
index aea35ef0343a92b0c3e0e317f4fff232cb1f47ec..640770732f4d31f1105b7802c0fd8638c2428a48 100644 (file)
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
@@ -20,8 +20,6 @@ Abstract:
   \r
 --*/\r
 \r
-#include "PeiServicesTablePointerLibInternals.h"\r
-\r
 /**\r
   The function returns the pointer to PeiServices.\r
 \r

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
deleted file mode 100644 (file)
index bb0463e..0000000
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/** @file\r
-  Include file for internal functions of PEI Services table pointer libary.\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
-  Module Name:  PeiServicesTablePointerLibInternals.h\r
-\r
-**/\r
-\r
-#ifndef __PEI_SERVICES_TABLE_POINTER_LIB_INTERTALS_H__\r
-#define __PEI_SERVICES_TABLE_POINTER_LIB_INTERTALS_H__\r
-\r
-/**\r
-  Reads the current value of Kr1.\r
-\r
-  @return The current value of Kr1.\r
-\r
-**/\r
-UINT64\r
-EFIAPI\r
-AsmReadKr1 (\r
-  VOID\r
-  );\r
-\r
-/**\r
-  Writes the current value of Kr1.\r
-\r
-  @param  Value The 64-bit value to write to Kr1.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-AsmWriteKr1 (\r
-  IN      UINT64                    Value\r
-  );\r
-\r
-#endif\r

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
index 4e4c064559ca117ee8d6a706fbbdc60b3de15edf..dead3f5cb262f3363070e412a2f258e2359b2ceb 100644 (file)
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
@@ -29,12 +29,12 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>DebugLib</Keyword>\r
     </LibraryClass>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" SupModuleList="PEIM">\r
+      <Keyword>BaseLib</Keyword>\r
+    </LibraryClass>\r
   </LibraryClassDefinitions>\r
   <SourceFiles>\r
     <Filename>PeiServicesTablePointer.c</Filename>\r
-    <Filename>PeiServicesTablePointerLibInternals.h</Filename>\r
-    <Filename SupArchList="IPF">Ipf/ReadKr1.s</Filename>\r
-    <Filename SupArchList="IPF">Ipf/WriteKr1.s</Filename>\r
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r