Reviewed-by: Kelly Steele <kelly.ste...@intel.com>
> -----Original Message-----
> From: Kinney, Michael D
> Sent: April 25, 2019 10:54
> To: devel@edk2.groups.io
> Cc: Steele, Kelly <kelly.ste...@intel.com>
> Subject: [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib
> name collision
>
> Change function name from ResetSystem() to PlatformResetSystem()
> to resolve name collision with ResetSystemLib.
>
> Cc: Kelly Steele <kelly.ste...@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
> ---
> QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c | 6 +++---
> .../Platform/Pei/PlatformInit/PlatformEarlyInit.h | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c
> b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c
> index cc2a6674d0..cfdcba8e02 100644
> --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c
> +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c
> @@ -7,7 +7,7 @@ following action is performed in this file,
> 4. Set MTRR for PEI
> 5. Create FV HOB and Flash HOB
>
> -Copyright (c) 2013 - 2016, Intel Corporation.
> +Copyright (c) 2013 - 2019, Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
> extern EFI_PEI_PPI_DESCRIPTOR mPpiStall[];
>
> -EFI_PEI_RESET_PPI mResetPpi = { ResetSystem };
> +EFI_PEI_RESET_PPI mResetPpi = { PlatformResetSystem };
>
> EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = {
> {
> @@ -40,7 +40,7 @@ EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = {
> **/
> EFI_STATUS
> EFIAPI
> -ResetSystem (
> +PlatformResetSystem (
> IN CONST EFI_PEI_SERVICES **PeiServices
> )
> {
> diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
> b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
> index 6792538d42..84def44717 100644
> --- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
> +++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
> @@ -1,7 +1,7 @@
> /** @file
> The header file of Platform PEIM.
>
> -Copyright (c) 2013 Intel Corporation.
> +Copyright (c) 2013 - 2019 Intel Corporation.
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -59,7 +59,7 @@ UpdateBootMode (
> **/
> EFI_STATUS
> EFIAPI
> -ResetSystem (
> +PlatformResetSystem (
> IN CONST EFI_PEI_SERVICES **PeiServices
> );
>
> --
> 2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#39585): https://edk2.groups.io/g/devel/message/39585
Mute This Topic: https://groups.io/mt/31345223/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
