From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=benjamin.you@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3365721A04E2F for ; Tue, 28 Nov 2017 17:46:51 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2017 17:51:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,470,1505804400"; d="scan'208";a="7332333" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga004.fm.intel.com with ESMTP; 28 Nov 2017 17:51:15 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 28 Nov 2017 17:51:15 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Wed, 29 Nov 2017 09:51:13 +0800 From: "You, Benjamin" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Ma, Maurice" , "Agyeman, Prince" Thread-Topic: [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp library removal Thread-Index: AQHTaK1qtmoECLv6QkGmCu4ZBEvGb6Mqlr+Q Date: Wed, 29 Nov 2017 01:51:12 +0000 Message-ID: References: <20171129005952.208940-1-ruiyu.ni@intel.com> <20171129005952.208940-6-ruiyu.ni@intel.com> In-Reply-To: <20171129005952.208940-6-ruiyu.ni@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjk4MWUyZGUtMWM2ZC00MGMwLTk4ODgtNTljOTQ1ZjA0M2VhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiIwOWZ0RmpWYWlLbkE2WkZMUnJWXC9WdlM1ZWN6SFpqNmt0czlHTmIyNCtaS0RuZnlkZjNVQks3dDA3TGtOaWdlZCJ9 dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp library removal X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2017 01:46:52 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Benjamin You > -----Original Message----- > From: Ni, Ruiyu > Sent: Wednesday, November 29, 2017 9:00 AM > To: edk2-devel@lists.01.org > Cc: Ma, Maurice ; Agyeman, Prince > ; You, Benjamin > Subject: [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp= /Dp > library removal >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Maurice Ma > Cc: Prince Agyeman > Cc: Benjamin You > --- > CorebootPayloadPkg/CorebootPayloadPkg.fdf | 4 ++- > CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 36 +++++++++++++-----= - > ----- > CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 36 +++++++++++++---- > ------- > 3 files changed, 41 insertions(+), 35 deletions(-) >=20 > diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > index 303e626842..7994f0c949 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this dist= ribution. > # The full text of the license may be found at > @@ -180,6 +180,8 @@ [FV.DXEFV] > # Shell > # > !if $(SHELL_TYPE) =3D=3D BUILD_SHELL > +INF > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > +INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > INF ShellPkg/Application/Shell/Shell.inf > !endif >=20 > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > index cdfcb75b59..ace1bc0a37 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this dist= ribution. > # The full text of the license may be found at > @@ -515,11 +515,6 @@ [Components.IA32] >=20 > !if $(SHELL_TYPE) =3D=3D BUILD_SHELL >=20 > -[PcdsFixedAtBuild] > - ## This flag is used to control initialization of the shell library > - # This should be FALSE for compiling the shell application itself onl= y. > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - > # > # Shell Lib > # > @@ -527,9 +522,27 @@ [LibraryClasses] >=20 > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCo > mmandLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > + NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf >=20 > [Components.IA32] > + > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > { > + > + ## This flag is used to control initialization of the shell librar= y > + # This should be FALSE for compiling the dynamic command. > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf { > + > + ## This flag is used to control initialization of the shell librar= y > + # This should be FALSE for compiling the dynamic command. > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > ShellPkg/Application/Shell/Shell.inf { > + > + ## This flag is used to control initialization of the shell librar= y > + # This should be FALSE for compiling the shell application itself= only. > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >=20 > #------------------------------ > # Basic commands > @@ -549,14 +562,6 @@ [Components.IA32] >=20 > >=20 > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Co > mmandsLib.inf > - > NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf > - > - #------------------------------ > - # Performance command > - #------------------------------ > - > - > - NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf >=20 > #------------------------------ > # Support libraries > @@ -565,13 +570,10 @@ [Components.IA32] > > DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.i= nf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.i= nf >=20 > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL= ib.i > nf > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntry= Lib.inf >=20 > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi > b.inf > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > } >=20 > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > index 6b16af63ba..2492142b97 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > @@ -3,7 +3,7 @@ > # > # Provides drivers and definitions to create uefi payload for coreboot. > # > -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
> # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this dist= ribution. > # The full text of the license may be found at > @@ -516,11 +516,6 @@ [Components.X64] >=20 > !if $(SHELL_TYPE) =3D=3D BUILD_SHELL >=20 > -[PcdsFixedAtBuild] > - ## This flag is used to control initialization of the shell library > - # This should be FALSE for compiling the shell application itself onl= y. > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - > # > # Shell Lib > # > @@ -528,9 +523,27 @@ [LibraryClasses] >=20 > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCo > mmandLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > + NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf >=20 > [Components.X64] > + > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > { > + > + ## This flag is used to control initialization of the shell librar= y > + # This should be FALSE for compiling the dynamic command. > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf { > + > + ## This flag is used to control initialization of the shell librar= y > + # This should be FALSE for compiling the dynamic command. > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > ShellPkg/Application/Shell/Shell.inf { > + > + ## This flag is used to control initialization of the shell librar= y > + # This should be FALSE for compiling the shell application itself= only. > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >=20 > #------------------------------ > # Basic commands > @@ -550,14 +563,6 @@ [Components.X64] >=20 > >=20 > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Co > mmandsLib.inf > - > NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf > - > - #------------------------------ > - # Performance command > - #------------------------------ > - > - > - NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf >=20 > #------------------------------ > # Support libraries > @@ -566,13 +571,10 @@ [Components.X64] > > DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.i= nf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.i= nf >=20 > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL= ib.i > nf > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntry= Lib.inf >=20 > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi > b.inf > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > } >=20 > -- > 2.15.0.gvfs.1.preview.4