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.93; helo=mga11.intel.com; envelope-from=benjamin.you@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 684DE21A00AE6 for ; Sun, 4 Nov 2018 22:04:06 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2018 22:04:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,466,1534834800"; d="scan'208";a="247014308" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga004.jf.intel.com with ESMTP; 04 Nov 2018 22:04:06 -0800 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 4 Nov 2018 22:04:05 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 4 Nov 2018 22:04:05 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by shsmsx102.ccr.corp.intel.com ([169.254.2.84]) with mapi id 14.03.0415.000; Mon, 5 Nov 2018 14:04:03 +0800 From: "You, Benjamin" To: "Zhang, Shenglei" , "edk2-devel@lists.01.org" CC: "Ma, Maurice" , "Agyeman, Prince" Thread-Topic: [PATCH v3 5/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF Thread-Index: AQHUdLTWJCsBstOja0CBW3YjrTdcmqVAsSOw Date: Mon, 5 Nov 2018 06:04:02 +0000 Message-ID: References: <20181105030807.27420-1-shenglei.zhang@intel.com> <20181105030807.27420-6-shenglei.zhang@intel.com> In-Reply-To: <20181105030807.27420-6-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzFjZTUwOGItMzg3NC00NDU1LTkxZGUtZGNhNWU5ODMwNzYxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiU00wNEZQVGNQdTFRMko4OUhQQjdlVlhSS3JQd3NHa2hrRmtkMFVZaUpKM2ZGOTFcL1VCN0J0UmVaeTdFTURtSUkifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v3 5/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2018 06:04:07 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Benjamin You > -----Original Message----- > From: Zhang, Shenglei > Sent: Monday, November 5, 2018 11:08 AM > To: edk2-devel@lists.01.org > Cc: Zhang, Shenglei ; Ma, Maurice > ; Agyeman, Prince ; You, > Benjamin > Subject: [PATCH v3 5/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF >=20 > From: shenglei >=20 > Remove EdkShellBinPkg in CorebootPayloadPkg.fdf. > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1108 >=20 > v3:Remove FULL_BIN and change SHELL_TYPE from FULL_BIN > to UEFI_BIN. >=20 > Cc: Maurice Ma > Cc: Prince Agyeman > Cc: Benjamin You > Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Shenglei Zhang > --- > CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 -------- > CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 ++------- > CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 9 ++------- > 3 files changed, 4 insertions(+), 22 deletions(-) >=20 > diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > index 7994f0c949..741a5c232e 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf > +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf > @@ -185,14 +185,6 @@ INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > INF ShellPkg/Application/Shell/Shell.inf > !endif >=20 > -!if $(SHELL_TYPE) =3D=3D FULL_BIN > -!if $(ARCH) =3D=3D IA32 > -INF RuleOverride =3D BINARY USE =3D IA32 EdkShellBinPkg/FullShell/FullS= hell.inf > -!else > -INF RuleOverride =3D BINARY USE =3D X64 EdkShellBinPkg/FullShell/FullSh= ell.inf > -!endif > -!endif > - > !if $(SHELL_TYPE) =3D=3D MIN_BIN > !if $(ARCH) =3D=3D IA32 > INF RuleOverride =3D BINARY USE =3D IA32 > ShellBinPkg/MinUefiShell/MinUefiShell.inf > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > index 7d5052be93..467d4fcdb4 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc > @@ -83,9 +83,9 @@ > DEFINE USE_HPET_TIMER =3D FALSE >=20 > # > - # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI] > + # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI] > # > - DEFINE SHELL_TYPE =3D FULL_BIN > + DEFINE SHELL_TYPE =3D UEFI_BIN >=20 > [BuildOptions] > *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACE= S > @@ -327,13 +327,8 @@ > # > # Set the proper Shell file GUID > # > - !if $(SHELL_TYPE) =3D=3D FULL_BIN > - # c57ad6b7-0515-40a8-9d21-551652854e37 > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, > 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0= x4E, > 0x37 } > - !else > # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, > 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0= xB4, > 0xD1 } > - !endif >=20 >=20 > ################################################################# > ############### > # > diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > index 0484e941cc..673bd26c79 100644 > --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc > @@ -83,9 +83,9 @@ > DEFINE USE_HPET_TIMER =3D FALSE >=20 > # > - # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI] > + # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI] > # > - DEFINE SHELL_TYPE =3D FULL_BIN > + DEFINE SHELL_TYPE =3D UEFI_BIN >=20 > [BuildOptions] > *_*_*_CC_FLAGS =3D -D DISABLE_NEW_DEPRECATED_INTERFACE= S > @@ -328,13 +328,8 @@ > # > # Set the proper Shell file GUID > # > - !if $(SHELL_TYPE) =3D=3D FULL_BIN > - # c57ad6b7-0515-40a8-9d21-551652854e37 > - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, > 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0= x4E, > 0x37 } > - !else > # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, > 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0= xB4, > 0xD1 } > - !endif >=20 >=20 > ################################################################# > ############### > # > -- > 2.18.0.windows.1