[PATCH V2 0/5] Delete UefiCpuLib usage

[PATCH V2 0/5] Delete UefiCpuLib usage

[Zhiguang Liu]

Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
to MdePkg/CpuLib.
Currently, UefiCpuLib is a dummy library to avoid build issue, after
this patch set, UefiCpuLib can be completely removed from Edk2.

V2: only change the patch NO.1 to let SecMain link CpuLib

Zhiguang Liu (5):
  SimicsOpenBoardPkg: Delete UefiCpuLib usage
  MinPlatformPkg: Delete UefiCpuLib usage
  QuarkPlatformPkg: Delete UefiCpuLib usage
  Vlv2TbltDevicePkg: Delete UefiCpuLib usage
  QuarkSocPkg: Delete UefiCpuLib usage

 Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 3 +--
 Platform/Intel/QuarkPlatformPkg/Quark.dsc                   | 3 +--
 Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc                | 3 +--
 Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c         | 3 +--
 Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf       | 3 +--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc        | 3 +--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc         | 3 +--
 Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc                   | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

-- 
2.26.2.windows.1

[PATCH V2 1/5] SimicsOpenBoardPkg: Delete UefiCpuLib usage

[Zhiguang Liu]

Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
to MdePkg/CpuLib.
V2: 
Let SecMain file use CpuLib

Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c   | 4 ++--
 Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
index 4514641b46..6b572b38a8 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
+++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c
@@ -1,7 +1,7 @@
 /** @file
   Main SEC phase code.  Transitions to PEI.
 
-  Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2008 - 2023, Intel Corporation. All rights reserved.<BR>
   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -15,7 +15,7 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PcdLib.h>
-#include <Library/UefiCpuLib.h>
+#include <Library/CpuLib.h>
 #include <Library/DebugAgentLib.h>
 #include <Library/IoLib.h>
 #include <Library/PeCoffLib.h>
diff --git a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
index 61ca2c0613..9dd492a2fb 100644
--- a/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
+++ b/Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf
@@ -1,7 +1,7 @@
 ## @file
 #  SEC Driver
 #
-# Copyright (c) 2008 - 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2008 - 2023 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -44,7 +44,7 @@
   BaseMemoryLib
   PeiServicesLib
   PcdLib
-  UefiCpuLib
+  CpuLib
   DebugAgentLib
   IoLib
   PeCoffLib
-- 
2.31.1.windows.1

[PATCH V2 2/5] MinPlatformPkg: Delete UefiCpuLib usage

[Zhiguang Liu]

Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
to MdePkg/CpuLib.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
index 3749199da7..5ce21cf31e 100644
--- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
+++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
@@ -1,7 +1,7 @@
 ## @file
 #  Platform description.
 #
-# Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2023, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -60,7 +60,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
 
   #
   # Framework
-- 
2.26.2.windows.1

[PATCH V2 3/5] QuarkPlatformPkg: Delete UefiCpuLib usage

[Zhiguang Liu]

Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
to MdePkg/CpuLib.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 Platform/Intel/QuarkPlatformPkg/Quark.dsc    | 3 +--
 Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc
index 24a19bb464..7cc548058a 100644
--- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc
+++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc
@@ -2,7 +2,7 @@
 # Clanton Peak CRB platform with 32-bit DXE for 4MB/8MB flash devices.
 #
 # This package provides Clanton Peak CRB platform specific modules.
-# Copyright (c) 2013 - 2020 Intel Corporation.
+# Copyright (c) 2013 - 2023 Intel Corporation.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -122,7 +122,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc
index a337d497a6..59577eda4f 100644
--- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc
+++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc
@@ -2,7 +2,7 @@
 # Clanton Peak CRB platform with 32-bit DXE for 4MB/8MB flash devices.
 #
 # This package provides Clanton Peak CRB platform specific modules.
-# Copyright (c) 2013 - 2020 Intel Corporation.
+# Copyright (c) 2013 - 2023 Intel Corporation.
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -110,7 +110,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-- 
2.26.2.windows.1

[PATCH V2 4/5] Vlv2TbltDevicePkg: Delete UefiCpuLib usage

[Zhiguang Liu]

Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
to MdePkg/CpuLib.

Cc: Zailiang Sun <zailiang.sun@intel.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 3 +--
 Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 06f2a5563d..4adbaa6966 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1,7 +1,7 @@
 #/** @file
 # Platform description.
 #
-# Copyright (c) 2012  - 2021, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012  - 2023, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -113,7 +113,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 8215a9130e..c7d9733dad 100644
--- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1,7 +1,7 @@
 #/** @file
 # Platform description.
 #
-# Copyright (c) 2012  - 2021, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012  - 2023, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -115,7 +115,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-- 
2.26.2.windows.1

[PATCH V2 5/5] QuarkSocPkg: Delete UefiCpuLib usage

[Zhiguang Liu]

Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
to MdePkg/CpuLib.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc
index 80e37e26a9..3384d6d3ce 100644
--- a/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc
+++ b/Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc
@@ -4,7 +4,7 @@
 # This DSC file is used for Package Level build.
 #
 # This Module provides FRAMEWORK reference implementation for INTEL Quark SoC.
-#   Copyright (c) 2013-2021 Intel Corporation.
+#   Copyright (c) 2013-2023 Intel Corporation.
 #
 #   SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -79,7 +79,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
-  UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
   #
   # Framework
   #
-- 
2.26.2.windows.1

Re: [edk2-devel] [PATCH V2 0/5] Delete UefiCpuLib usage

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>


> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Zhiguang Liu
> Sent: Thursday, April 6, 2023 1:14 AM
> To: devel@edk2.groups.io
> Cc: Liu, Zhiguang <zhiguang.liu@intel.com>
> Subject: [edk2-devel] [PATCH V2 0/5] Delete UefiCpuLib usage
> 
> Delete UefiCpuLib usage because UefiCpuPkg/UefiCpuLib is merged
> to MdePkg/CpuLib.
> Currently, UefiCpuLib is a dummy library to avoid build issue, after
> this patch set, UefiCpuLib can be completely removed from Edk2.
> 
> V2: only change the patch NO.1 to let SecMain link CpuLib
> 
> Zhiguang Liu (5):
>   SimicsOpenBoardPkg: Delete UefiCpuLib usage
>   MinPlatformPkg: Delete UefiCpuLib usage
>   QuarkPlatformPkg: Delete UefiCpuLib usage
>   Vlv2TbltDevicePkg: Delete UefiCpuLib usage
>   QuarkSocPkg: Delete UefiCpuLib usage
> 
>  Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 3 +--
>  Platform/Intel/QuarkPlatformPkg/Quark.dsc                   | 3 +--
>  Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc                | 3 +--
>  Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.c         | 3 +--
>  Platform/Intel/SimicsOpenBoardPkg/SecCore/SecMain.inf       | 3 +--
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc        | 3 +--
>  Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc         | 3 +--
>  Silicon/Intel/QuarkSocPkg/QuarkSocPkg.dsc                   | 3 +--
>  8 files changed, 8 insertions(+), 16 deletions(-)
> 
> --
> 2.26.2.windows.1
> 
> 
> 
> 
>