Move CpuPageTableLib definition from UefiCpuPkg to MdePkg. The lib instance still remains in UefiCpuPkg. Move CpuPageTableLib definition to a common location can avoid the case that MdeModulePkg need to depend on UefiCpuPkg since DxeIpl module in MdeModulePkg needs to consume CpuPageTableLib.
Signed-off-by: Dun Tan <dun....@intel.com> Cc: Michael D Kinney <michael.d.kin...@intel.com> Cc: Liming Gao <gaolim...@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang....@intel.com> Cc: Ray Ni <ray...@intel.com> --- {UefiCpuPkg => MdePkg}/Include/Library/CpuPageTableLib.h | 0 MdePkg/MdePkg.dec | 5 ++++- UefiCpuPkg/UefiCpuPkg.dec | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/Include/Library/CpuPageTableLib.h b/MdePkg/Include/Library/CpuPageTableLib.h similarity index 100% rename from UefiCpuPkg/Include/Library/CpuPageTableLib.h rename to MdePkg/Include/Library/CpuPageTableLib.h diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 7488ccda7a..dfbca2d746 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -4,7 +4,7 @@ # It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of # EFI1.10/UEFI2.7/PI1.7 and some Industry Standards. # -# Copyright (c) 2007 - 2022, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2007 - 2023, Intel Corporation. All rights reserved.<BR> # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> # (C) Copyright 2016 - 2021 Hewlett Packard Enterprise Development LP<BR> # Copyright (c) 2022, Loongson Technology Corporation Limited. All rights reserved.<BR> @@ -321,6 +321,9 @@ ## @libraryclass Provides function to support TDX processing. TdxLib|Include/Library/TdxLib.h + ## @libraryclass Provides function for manipulating x86 paging structures. + CpuPageTableLib|Include/Library/CpuPageTableLib.h + [LibraryClasses.RISCV64] ## @libraryclass Provides function to make ecalls to SBI BaseRiscVSbiLib|Include/Library/BaseRiscVSbiLib.h diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index a5528277ff..5ad41e9ae3 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -57,9 +57,6 @@ ## @libraryclass Provides function for loading microcode. MicrocodeLib|Include/Library/MicrocodeLib.h - ## @libraryclass Provides function for manipulating x86 paging structures. - CpuPageTableLib|Include/Library/CpuPageTableLib.h - [Guids] gUefiCpuPkgTokenSpaceGuid = { 0xac05bf33, 0x995a, 0x4ed4, { 0xaa, 0xb8, 0xef, 0x7a, 0xe8, 0xf, 0x5c, 0xb0 }} gMsegSmramGuid = { 0x5802bce4, 0xeeee, 0x4e33, { 0xa1, 0x30, 0xeb, 0xad, 0x27, 0xf0, 0xe4, 0x39 }} -- 2.31.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#103475): https://edk2.groups.io/g/devel/message/103475 Mute This Topic: https://groups.io/mt/98467035/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-