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.136, mailfrom: liming.gao@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Sun, 28 Apr 2019 01:25:05 -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 fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Apr 2019 01:25:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,405,1549958400"; d="scan'208";a="139481914" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga006.jf.intel.com with ESMTP; 28 Apr 2019 01:25:04 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 28 Apr 2019 01:25:03 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 28 Apr 2019 01:25:03 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.21]) with mapi id 14.03.0415.000; Sun, 28 Apr 2019 16:25:01 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Steele, Kelly" Subject: Re: [edk2-devel] [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Thread-Topic: [edk2-devel] [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Thread-Index: AQHU+4/WW3/hz8+y5EGLoOJSLtYWGqZRQJ1g Date: Sun, 28 Apr 2019 08:25:01 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E431C9E@SHSMSX104.ccr.corp.intel.com> References: <20190425175334.5944-1-michael.d.kinney@intel.com> <20190425175334.5944-5-michael.d.kinney@intel.com> In-Reply-To: <20190425175334.5944-5-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of >Michael D Kinney >Sent: Friday, April 26, 2019 1:54 AM >To: devel@edk2.groups.io >Cc: Steele, Kelly >Subject: [edk2-devel] [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 >Signed-off-by: Michael D Kinney >--- > 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 =3D { ResetSystem }; >+EFI_PEI_RESET_PPI mResetPpi =3D { PlatformResetSystem }; > > EFI_PEI_PPI_DESCRIPTOR mPpiList[1] =3D { > { >@@ -40,7 +40,7 @@ EFI_PEI_PPI_DESCRIPTOR mPpiList[1] =3D { > **/ > 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 > > >