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

5 files changed, 3 insertions, 144 deletions

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
deleted file mode 100644
index 6f3155c8a7..0000000000
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/ReadKr1.s
+++ /dev/null
@@ -1,47 +0,0 @@
-//++

-//

-// Copyright (c) 2006 Intel Corporation. All rights reserved

-// This software and associated documentation (if any) is furnished

-// under a license and may only be used or copied in accordance

-// with the terms of the license. Except as permitted by such

-// license, no part of this software or documentation may be

-// reproduced, stored in a retrieval system, or transmitted in any

-// form or by any means without the express written consent of

-// Intel Corporation.

-//

-//

-// Module Name:

-//

-//   ReadKr1.s

-//

-// Abstract:

-//

-//   Contains assembly code for read Kr1.

-//

-//--

-

-  .file  "ReadKr1.s"

-

-#include  "IpfMacro.i"

-

-//---------------------------------------------------------------------------------

-//++

-// AsmReadKr1

-//

-// This routine is used to get KR1. KR1 is used to store Pei Service Table

-// Pointer in archeture.

-//

-// Arguments : 

-//

-// On Entry :  None.

-//

-// Return Value: Pei Services Table.

-// 

-//--

-//----------------------------------------------------------------------------------

-PROCEDURE_ENTRY (AsmReadKr1)

-        

-        mov             r8 = ar.k1;;  // Pei Services Table Pointer

-        br.ret.dpnt     b0;;

-

-PROCEDURE_EXIT (AsmReadKr1)

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
deleted file mode 100644
index 48d276c95a..0000000000
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/Ipf/WriteKr1.s
+++ /dev/null
@@ -1,48 +0,0 @@
-//++

-//

-// Copyright (c) 2006 Intel Corporation. All rights reserved

-// This software and associated documentation (if any) is furnished

-// under a license and may only be used or copied in accordance

-// with the terms of the license. Except as permitted by such

-// license, no part of this software or documentation may be

-// reproduced, stored in a retrieval system, or transmitted in any

-// form or by any means without the express written consent of

-// Intel Corporation.

-//

-//

-// Module Name:

-//

-//   WriteKr1.s

-//

-// Abstract:

-//

-//   Contains assembly code for write Kr1.

-//

-//--

-

-  .file  "WriteKr1.s"

-

-#include  "IpfMacro.i"

-

-//---------------------------------------------------------------------------------

-//++

-// AsmWriteKr1

-//

-// This routine is used to Write KR1. KR1 is used to store Pei Service Table

-// Pointer in archeture.

-//

-// Arguments : r32  Pei Services Table Pointer

-//

-// On Entry :  None.

-//

-// Return Value: None.

-// 

-//--

-//----------------------------------------------------------------------------------

-PROCEDURE_ENTRY (AsmWriteKr1)

-        

-        mov             ar.k1 = r32;;  // Pei Services Table Pointer

-        br.ret.dpnt     b0;;

-

-PROCEDURE_EXIT (AsmWriteKr1)

- 
\ No newline at end of file
diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
index aea35ef034..640770732f 100644
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointer.c
@@ -20,8 +20,6 @@ Abstract:
   

 --*/

 

-#include "PeiServicesTablePointerLibInternals.h"

-

 /**

   The function returns the pointer to PeiServices.

 

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
deleted file mode 100644
index bb0463ef2a..0000000000
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibInternals.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/** @file

-  Include file for internal functions of PEI Services table pointer libary.

-

-  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.

-

-  Module Name:  PeiServicesTablePointerLibInternals.h

-

-**/

-

-#ifndef __PEI_SERVICES_TABLE_POINTER_LIB_INTERTALS_H__

-#define __PEI_SERVICES_TABLE_POINTER_LIB_INTERTALS_H__

-

-/**

-  Reads the current value of Kr1.

-

-  @return The current value of Kr1.

-

-**/

-UINT64

-EFIAPI

-AsmReadKr1 (

-  VOID

-  );

-

-/**

-  Writes the current value of Kr1.

-

-  @param  Value The 64-bit value to write to Kr1.

-

-**/

-VOID

-EFIAPI

-AsmWriteKr1 (

-  IN      UINT64                    Value

-  );

-

-#endif

diff --git a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
index 4e4c064559..dead3f5cb2 100644
--- a/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
+++ b/OldMdePkg/Library/PeiServicesTablePointerLibKr1/PeiServicesTablePointerLibKr1.msa
@@ -29,12 +29,12 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>DebugLib</Keyword>

     </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED" SupModuleList="PEIM">

+      <Keyword>BaseLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>PeiServicesTablePointer.c</Filename>

-    <Filename>PeiServicesTablePointerLibInternals.h</Filename>

-    <Filename SupArchList="IPF">Ipf/ReadKr1.s</Filename>

-    <Filename SupArchList="IPF">Ipf/WriteKr1.s</Filename>

   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>