From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.3562.1648535835036332664 for ; Mon, 28 Mar 2022 23:37:43 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=h0iiJzXx; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: yu.pu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648535862; x=1680071862; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=7dUiSZq36PLjvKRSGDTsxg4EnWjM+FtiHxSzj59dcDY=; b=h0iiJzXxjl6EjNmLCcVS26FbzKPvA9TgOL9F+bkX8csnfrvdP5LmSZ4T BBL8RiI0MZZwzHAvZ6KeedGRqcJ2NgU6HUehRDyaE/D5gICmUpHA3q+W1 Ur0RzoqAlyyuUdL+C42/PtZRS62DjIa+Q7sItkDNC8b11+m1UDbzQHITI xYQFzg0Z/NBdxfXph2VxuYwFAtsDNtYiNBXmIMIlQPKFO3rzHSyUV6AAr 92P7slojO/JMT7sWeRJ9ZC+PA6m9hDbDR7p4p9qz/4+QPQv/AkHTacbFk YrKuVnoFo0nKjLHnnfHmvxBSoufprufsNQ5yk5EgaGi9u/Jb0mzZiVNw0 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10300"; a="258003938" X-IronPort-AV: E=Sophos;i="5.90,219,1643702400"; d="scan'208";a="258003938" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2022 23:37:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,219,1643702400"; d="scan'208";a="521316666" Received: from shwdeopenlab704.ccr.corp.intel.com ([10.239.182.50]) by orsmga006.jf.intel.com with ESMTP; 28 Mar 2022 23:37:41 -0700 From: Yu Pu To: devel@edk2.groups.io Cc: Yu Pu , Eric Dong , Ray Ni , Rahul Kumar Subject: [PATCH v1 15/15] UefiCpuLib: Remove UefiCpuLib. Date: Tue, 29 Mar 2022 14:37:03 +0800 Message-Id: <20220329063703.549-16-yu.pu@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20220329063703.549-1-yu.pu@intel.com> References: <20220329063703.549-1-yu.pu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Step 4 to merge UefiCpuLib to CpuLib. Cc: Eric Dong Cc: Ray Ni Cc: Rahul Kumar Signed-off-by: Yu Pu --- UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c | 16 --------- UefiCpuPkg/Include/Library/UefiCpuLib.h | 4 --- UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 35 --------------= ------ UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni | 16 --------- UefiCpuPkg/UefiCpuPkg.dec | 5 --- UefiCpuPkg/UefiCpuPkg.dsc | 2 -- 6 files changed, 78 deletions(-) diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c b/UefiC= puPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c deleted file mode 100644 index eaecd4ae5ed7..000000000000 --- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLibNull.c +++ /dev/null @@ -1,16 +0,0 @@ -/** @file=0D -This library contains a dummy function to pass build.=0D -=0D -Copyright (c) 2022, Intel Corporation. All rights reserved.=0D -=0D -SPDX-License-Identifier: BSD-2-Clause-Patent=0D -**/=0D -#include =0D -STATIC=0D -VOID=0D -Dummy (=0D - VOID=0D - )=0D -{=0D -=0D -}=0D diff --git a/UefiCpuPkg/Include/Library/UefiCpuLib.h b/UefiCpuPkg/Include/L= ibrary/UefiCpuLib.h deleted file mode 100644 index c9de5a62d991..000000000000 --- a/UefiCpuPkg/Include/Library/UefiCpuLib.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef __UEFI_CPU_LIB_H__=0D -#define __UEFI_CPU_LIB_H__=0D -=0D -#endif=0D diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf b/UefiCpu= Pkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf deleted file mode 100644 index 9f8b62d87aae..000000000000 --- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf +++ /dev/null @@ -1,35 +0,0 @@ -## @file=0D -# This library defines some routines that are generic for IA32 family CPU= .=0D -#=0D -# The library routines are UEFI specification compliant.=0D -#=0D -# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
= =0D -# Copyright (c) 2020, AMD Inc. All rights reserved.
=0D -# SPDX-License-Identifier: BSD-2-Clause-Patent=0D -#=0D -##=0D -=0D -[Defines]=0D - INF_VERSION =3D 0x00010005=0D - BASE_NAME =3D BaseUefiCpuLib=0D - MODULE_UNI_FILE =3D BaseUefiCpuLib.uni=0D - FILE_GUID =3D 34C24FD7-7A90-45c2-89FD-946473D9CE98= =0D - MODULE_TYPE =3D BASE=0D - VERSION_STRING =3D 1.0=0D - LIBRARY_CLASS =3D UefiCpuLib=0D -=0D -#=0D -# The following information is for reference only and not required by the = build tools.=0D -#=0D -# VALID_ARCHITECTURES =3D IA32 X64=0D -#=0D -=0D -[Sources]=0D - BaseUefiCpuLibNull.c=0D -=0D -[Packages]=0D - MdePkg/MdePkg.dec=0D - UefiCpuPkg/UefiCpuPkg.dec=0D -=0D -[LibraryClasses]=0D - BaseLib=0D diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni b/UefiCpu= Pkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni deleted file mode 100644 index 83c96cea67ce..000000000000 --- a/UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni +++ /dev/null @@ -1,16 +0,0 @@ -// /** @file=0D -// This library defines some routines that are generic for IA32 family CPU= .=0D -//=0D -// The library routines are UEFI specification compliant.=0D -//=0D -// Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.
= =0D -//=0D -// SPDX-License-Identifier: BSD-2-Clause-Patent=0D -//=0D -// **/=0D -=0D -=0D -#string STR_MODULE_ABSTRACT #language en-US "Defines generic r= outines for IA32 family CPUs."=0D -=0D -#string STR_MODULE_DESCRIPTION #language en-US "The library routi= nes comply with the UEFI Specification."=0D -=0D diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index 525cde463435..e40d78348f75 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -18,11 +18,6 @@ Include=0D =0D [LibraryClasses]=0D - ## @libraryclass Defines some routines that are generic for IA32 famil= y CPU=0D - ## to be UEFI specification compliant.=0D - ##=0D - UefiCpuLib|Include/Library/UefiCpuLib.h=0D -=0D ## @libraryclass Defines some routines that are used to register/manag= e/program=0D ## CPU features.=0D ##=0D diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc index a0bbde9985d3..985a271f18cf 100644 --- a/UefiCpuPkg/UefiCpuPkg.dsc +++ b/UefiCpuPkg/UefiCpuPkg.dsc @@ -31,7 +31,6 @@ SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull= .inf=0D DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseD= ebugPrintErrorLevelLib.inf=0D DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf=0D - UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf=0D IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf=0D MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf=0D PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf=0D @@ -136,7 +135,6 @@ UefiCpuPkg/CpuIo2Smm/CpuIo2StandaloneMm.inf=0D UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf=0D - UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf=0D UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf=0D UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf=0D UefiCpuPkg/Library/CpuCommonFeaturesLib/CpuCommonFeaturesLib.inf=0D --=20 2.30.0.windows.2