QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision

Change function name from ResetSystem() to PlatformResetSystem()
to resolve name collision with ResetSystemLib.

Cc: Kelly Steele <kelly.steele@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>

diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c b/QuarkPlatformPkg/Platform/Pei/PlatformInit/MemoryCallback.c
index cc2a6674d0e06591c602a3d1ed11014a367d9ed1..cfdcba8e02f1e62021253d48624370049ec5f0dc 100644 (file)
--- 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\r
   5. Create FV HOB and Flash HOB\r
 \r
   4. Set MTRR for PEI\r
   5. Create FV HOB and Flash HOB\r
 \r

-Copyright (c) 2013 - 2016, Intel Corporation.\r
+Copyright (c) 2013 - 2019, Intel Corporation.\r

 \r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 \r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r


@@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 extern EFI_PEI_PPI_DESCRIPTOR mPpiStall[];\r
 \r
 \r
 extern EFI_PEI_PPI_DESCRIPTOR mPpiStall[];\r
 \r

-EFI_PEI_RESET_PPI mResetPpi = { ResetSystem };\r
+EFI_PEI_RESET_PPI mResetPpi = { PlatformResetSystem };\r

 \r
 EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = {\r
   {\r
 \r
 EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = {\r
   {\r


@@ -40,7 +40,7 @@ EFI_PEI_PPI_DESCRIPTOR mPpiList[1] = {
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-ResetSystem (\r
+PlatformResetSystem (\r

   IN CONST EFI_PEI_SERVICES          **PeiServices\r
   )\r
 {\r
   IN CONST EFI_PEI_SERVICES          **PeiServices\r
   )\r
 {\r

diff --git a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
index 6792538d427f79ceed61431e9458f94e172f6ddf..84def447177b416f3261456934ecc2f743f75666 100644 (file)
--- a/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
+++ b/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.h
@@ -1,7 +1,7 @@
 /** @file\r
 The header file of Platform PEIM.\r
 \r
 /** @file\r
 The header file of Platform PEIM.\r
 \r

-Copyright (c) 2013 Intel Corporation.\r
+Copyright (c) 2013 - 2019 Intel Corporation.\r

 \r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 \r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r


@@ -59,7 +59,7 @@ UpdateBootMode (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-ResetSystem (\r
+PlatformResetSystem (\r

   IN CONST EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r
   IN CONST EFI_PEI_SERVICES          **PeiServices\r
   );\r
 \r