From e02bcad41a8066e7e47983502395982e9937fbce Mon Sep 17 00:00:00 2001 From: "levi.yun" Date: Mon, 11 Nov 2024 12:43:24 +0000 Subject: [PATCH] ARM/VExpressPkg: apply some StandaloneMmPkg's movement StandaloneMmCoreEntryPoint Library and StandaloneMmCpu Driver for Arm are moved from StandaloneMmPkg to ArmPkg. apply this change. Signed-off-by: Levi.yun Change-Id: Ic800faa0fd3bd9d8ddd37735f73ee14eef0cbcec --- Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc | 6 +++--- Platform/ARM/VExpressPkg/PlatformStandaloneMm.fdf | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc index d47cae3936..a5ebb7065c 100644 --- a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc +++ b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.dsc @@ -65,7 +65,7 @@ PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf + StandaloneMmCoreEntryPoint|ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf @@ -172,12 +172,12 @@ # # MM Core # + ArmPkg/Library/ArmStandaloneMmCoreEntryPoint/ArmStandaloneMmCoreEntryPoint.inf StandaloneMmPkg/Core/StandaloneMmCore.inf { NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf } StandaloneMmPkg/Library/FvLib/FvLib.inf - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf @@ -186,7 +186,7 @@ StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf [Components.AARCH64, Components.ARM] - StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf + ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf !if $(ENABLE_UEFI_SECURE_VARIABLE) == TRUE diff --git a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.fdf b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.fdf index 44de2b9c78..0384323afc 100644 --- a/Platform/ARM/VExpressPkg/PlatformStandaloneMm.fdf +++ b/Platform/ARM/VExpressPkg/PlatformStandaloneMm.fdf @@ -69,7 +69,7 @@ READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE FvNameGuid = 87940482-fc81-41c3-87e6-399cf85ac8a0 - INF StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf + INF ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf !if $(ENABLE_UEFI_SECURE_VARIABLE) == TRUE INF Platform/ARM/Drivers/NorFlashDxe/NorFlashStandaloneMm.inf