From: Nate DeSimone <nathaniel.l.desim...@intel.com> Rename PeiCorePe32File to SecCorePe32File, because the variable actually contains the SEC core... not PEI core.
Cc: Andrew Fish <af...@apple.com> Cc: Ray Ni <ray...@intel.com> Cc: Michael D Kinney <michael.d.kin...@intel.com> Cc: Chasel Chiu <chasel.c...@intel.com> Signed-off-by: Nate DeSimone <nathaniel.l.desim...@intel.com> --- EmulatorPkg/Unix/Host/Host.c | 12 ++++++------ EmulatorPkg/Unix/Host/Host.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c index 1f29dd00a3..940e1953af 100644 --- a/EmulatorPkg/Unix/Host/Host.c +++ b/EmulatorPkg/Unix/Host/Host.c @@ -1,6 +1,6 @@ /*++ @file -Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -535,7 +535,7 @@ Arguments: LargestRegion - Memory to use for SEC. LargestRegionSize - Size of Memory to use for PEI BootFirmwareVolumeBase - Start of the Boot FV - PeiCorePe32File - SEC PE32 + SecCorePe32File - SEC PE32 Returns: Success means control is transferred and thus we should never return @@ -546,13 +546,13 @@ SecLoadFromCore ( IN UINTN LargestRegion, IN UINTN LargestRegionSize, IN UINTN BootFirmwareVolumeBase, - IN VOID *PeiCorePe32File + IN VOID *SecCorePe32File ) { EFI_STATUS Status; EFI_PHYSICAL_ADDRESS TopOfMemory; VOID *TopOfStack; - EFI_PHYSICAL_ADDRESS PeiCoreEntryPoint; + EFI_PHYSICAL_ADDRESS SecCoreEntryPoint; EFI_SEC_PEI_HAND_OFF *SecCoreData; UINTN PeiStackSize; @@ -597,7 +597,7 @@ SecLoadFromCore ( // // Find the SEC Core Entry Point // - Status = SecPeCoffGetEntryPoint (PeiCorePe32File, (VOID **)&PeiCoreEntryPoint); + Status = SecPeCoffGetEntryPoint (SecCorePe32File, (VOID **)&SecCoreEntryPoint); if (EFI_ERROR (Status)) { return; } @@ -606,7 +606,7 @@ SecLoadFromCore ( // Transfer control to the SEC Core // PeiSwitchStacks ( - (SWITCH_STACK_ENTRY_POINT)(UINTN)PeiCoreEntryPoint, + (SWITCH_STACK_ENTRY_POINT)(UINTN)SecCoreEntryPoint, SecCoreData, (VOID *)gPpiList, TopOfStack diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h index 0c81cdfc01..aecebc0143 100644 --- a/EmulatorPkg/Unix/Host/Host.h +++ b/EmulatorPkg/Unix/Host/Host.h @@ -1,6 +1,6 @@ /*++ @file -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR> SPDX-License-Identifier: BSD-2-Clause-Patent @@ -162,7 +162,7 @@ SecLoadFromCore ( IN UINTN LargestRegion, IN UINTN LargestRegionSize, IN UINTN BootFirmwareVolumeBase, - IN VOID *PeiCoreFile + IN VOID *SecCoreFile ); EFI_STATUS -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100564): https://edk2.groups.io/g/devel/message/100564 Mute This Topic: https://groups.io/mt/97308245/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-