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: kelly.steele@intel.com) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Thu, 25 Apr 2019 14:40:37 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 14:40:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,394,1549958400"; d="scan'208";a="167995182" Received: from orsmsx103.amr.corp.intel.com ([10.22.225.130]) by fmsmga001.fm.intel.com with ESMTP; 25 Apr 2019 14:40:37 -0700 Received: from orsmsx114.amr.corp.intel.com ([169.254.8.50]) by ORSMSX103.amr.corp.intel.com ([169.254.5.76]) with mapi id 14.03.0415.000; Thu, 25 Apr 2019 14:40:36 -0700 From: "Steele, Kelly" To: "Kinney, Michael D" , "devel@edk2.groups.io" Subject: Re: [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Thread-Topic: [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLib name collision Thread-Index: AQHU+4/StUaMxvMMmU25+mYkhY5AaKZNZ+Gw Date: Thu, 25 Apr 2019 21:40:36 +0000 Message-ID: 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-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzRjNzFhNmQtZDEzNi00ZDA4LWIwYzktMmNhY2Q0NjIwMzlkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoicHk3Q01VTStxUHAwUmhYQlgzc1wvM1pydkRrWU9nSUc2ZkN5eUpsWE1KY3dXeVVtUHF1aEZIeFwvRHVSVEIyRW9PIn0= x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.22.254.138] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Kelly Steele > -----Original Message----- > From: Kinney, Michael D > Sent: April 25, 2019 10:54 > To: devel@edk2.groups.io > Cc: Steele, Kelly > Subject: [Patch 4/4] QuarkPlatformPkg/PlatformInit: Resolve ResetSystemLi= b > name collision >=20 > Change function name from ResetSystem() to PlatformResetSystem() > to resolve name collision with ResetSystemLib. >=20 > 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(-) >=20 > 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 >=20 > -Copyright (c) 2013 - 2016, Intel Corporation. > +Copyright (c) 2013 - 2019, Intel Corporation. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > extern EFI_PEI_PPI_DESCRIPTOR mPpiStall[]; >=20 > -EFI_PEI_RESET_PPI mResetPpi =3D { ResetSystem }; > +EFI_PEI_RESET_PPI mResetPpi =3D { PlatformResetSystem }; >=20 > 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. >=20 > -Copyright (c) 2013 Intel Corporation. > +Copyright (c) 2013 - 2019 Intel Corporation. >=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -59,7 +59,7 @@ UpdateBootMode ( > **/ > EFI_STATUS > EFIAPI > -ResetSystem ( > +PlatformResetSystem ( > IN CONST EFI_PEI_SERVICES **PeiServices > ); >=20 > -- > 2.21.0.windows.1