From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: michael.d.kinney@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Mon, 29 Apr 2019 18:30:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 18:30:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,411,1549958400"; d="scan'208";a="139954346" Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com) ([10.241.111.157]) by orsmga006.jf.intel.com with ESMTP; 29 Apr 2019 18:30:15 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Kelly Steele Subject: [Patch V2 6/6] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Date: Mon, 29 Apr 2019 18:30:12 -0700 Message-Id: <20190430013012.24008-7-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190430013012.24008-1-michael.d.kinney@intel.com> References: <20190430013012.24008-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Change function name from ResetSystem() to PlatformResetSystem() to resolve name collision with ResetSystemLib. Cc: Kelly Steele Signed-off-by: Michael D Kinney Reviewed-by: Kelly Steele --- 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