From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Kelly Steele <kelly.steele@intel.com>
Subject: [Patch V2 6/6] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision
Date: Mon, 29 Apr 2019 18:30:12 -0700 [thread overview]
Message-ID: <20190430013012.24008-7-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com>
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>
---
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
prev parent reply other threads:[~2019-04-30 1:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 1:30 [Patch V2 0/6] Resolve Quark build and boot issues Michael D Kinney
2019-04-30 1:30 ` [Patch V2 1/6] MdePkg: Add PcdSpeculationBarrierType Michael D Kinney
2019-04-30 11:47 ` [edk2-devel] " Laszlo Ersek
2019-04-30 15:16 ` Michael D Kinney
2019-04-30 15:43 ` Laszlo Ersek
2019-04-30 1:30 ` [Patch V2 2/6] MdePkg/BaseLib: Use PcdSpeculationBarrierType Michael D Kinney
2019-04-30 11:49 ` [edk2-devel] " Laszlo Ersek
2019-04-30 15:17 ` Michael D Kinney
2019-04-30 22:24 ` Brian J. Johnson
2019-04-30 1:30 ` [Patch V2 3/6] QuarkPlatformPkg: Set PcdSpeculationBarrierType to CPUID Michael D Kinney
2019-04-30 1:30 ` [Patch V2 4/6] UefiCpuPkg/MpInitLib: Avoid MSR_IA32_APIC_BASE for single core Michael D Kinney
2019-04-30 10:31 ` Laszlo Ersek
2019-04-30 1:30 ` [Patch V2 5/6] QuarkSocPkg/SmmAccessDxe: Set region to UC on SMRAM close Michael D Kinney
2019-04-30 1:30 ` Michael D Kinney [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190430013012.24008-7-michael.d.kinney@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox