UefiCpuLib: Remove UefiCpuLib.

Because UefiCpuPkg/UefiCpuLib is merged to MdePkg/CpuLib and all modules
are updated to not depend on this library, remove it completely.

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Yu Pu <yu.pu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>

diff --git a/UefiCpuPkg/Include/Library/UefiCpuLib.h b/UefiCpuPkg/Include/Library/UefiCpuLib.h
deleted file mode 100644 (file)
index ab6982d..0000000
--- a/UefiCpuPkg/Include/Library/UefiCpuLib.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @file\r
-  Public header file for UEFI CPU library class.\r
-\r
-  This library class defines some routines that are generic for IA32 family CPU\r
-  to be UEFI specification compliant.\r
-\r
-  Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>\r
-  Copyright (c) 2020, AMD Inc. All rights reserved.<BR>\r
-  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-\r
-**/\r
-\r
-#ifndef __UEFI_CPU_LIB_H__\r
-#define __UEFI_CPU_LIB_H__\r
-\r
-#endif\r

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
deleted file mode 100644 (file)
index 9f8b62d..0000000
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
+++ /dev/null
@@ -1,35 +0,0 @@
-## @file\r
-#  This library defines some routines that are generic for IA32 family CPU.\r
-#\r
-#  The library routines are UEFI specification compliant.\r
-#\r
-#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
-#  Copyright (c) 2020, AMD Inc. All rights reserved.<BR>\r
-#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
-#\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = BaseUefiCpuLib\r
-  MODULE_UNI_FILE                = BaseUefiCpuLib.uni\r
-  FILE_GUID                      = 34C24FD7-7A90-45c2-89FD-946473D9CE98\r
-  MODULE_TYPE                    = BASE\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = UefiCpuLib\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = IA32 X64\r
-#\r
-\r
-[Sources]\r
-  BaseUefiCpuLibNull.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  UefiCpuPkg/UefiCpuPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
deleted file mode 100644 (file)
index 83c96ce..0000000
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni
+++ /dev/null
@@ -1,16 +0,0 @@
-// /** @file\r
-// This library defines some routines that are generic for IA32 family CPU.\r
-//\r
-// The library routines are UEFI specification compliant.\r
-//\r
-// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
-//\r
-// SPDX-License-Identifier: BSD-2-Clause-Patent\r
-//\r
-// **/\r
-\r
-\r
-#string STR_MODULE_ABSTRACT             #language en-US "Defines generic routines for IA32 family CPUs."\r
-\r
-#string STR_MODULE_DESCRIPTION          #language en-US "The library routines comply with the UEFI Specification."\r
-\r

diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c b/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c
deleted file mode 100644 (file)
index e29d2e8..0000000
--- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/** @file\r
-This library contains a dummy function to pass build.\r
-\r
-Copyright (c) 2022, Intel Corporation. All rights reserved.\r
-\r
-SPDX-License-Identifier: BSD-2-Clause-Patent\r
-**/\r
-#include <Base.h>\r
-\r
-/**\r
-  Dummy function.\r
-**/\r
-VOID\r
-Dummy (\r
-  VOID\r
-  )\r
-{\r
-}\r

diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec
index 2115aa4387a2cced9a8194673175c8382ea67746..a5528277ffb53ba7845252c4c9357754adfbe564 100644 (file)
--- a/UefiCpuPkg/UefiCpuPkg.dec
+++ b/UefiCpuPkg/UefiCpuPkg.dec
@@ -18,11 +18,6 @@
   Include\r
 \r
 [LibraryClasses]\r
-  ##  @libraryclass  Defines some routines that are generic for IA32 family CPU\r
-  ##                 to be UEFI specification compliant.\r
-  ##\r
-  UefiCpuLib|Include/Library/UefiCpuLib.h\r
-\r
   ##  @libraryclass  Defines some routines that are used to register/manage/program\r
   ##                 CPU features.\r
   ##\r

diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index d85d56916f2cdbce54f7aee73f01176d9ca5368d..593c11cc748217a6c0da6f4ee1fd422711935555 100644 (file)
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -31,7 +31,6 @@
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf\r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
@@ -136,7 +135,6 @@
   UefiCpuPkg/CpuIo2Smm/CpuIo2StandaloneMm.inf\r
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
   UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
-  UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
   UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf\r
   UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf\r
   UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf\r