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=ruiyu.ni@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 E5B3D21188469 for ; Sun, 4 Nov 2018 22:26:10 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2018 22:26:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,467,1534834800"; d="scan'208";a="105436212" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga001.jf.intel.com with ESMTP; 04 Nov 2018 22:26:09 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 4 Nov 2018 22:26:09 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.117]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.161]) with mapi id 14.03.0415.000; Mon, 5 Nov 2018 14:26:07 +0800 From: "Ni, Ruiyu" To: "Zhang, Shenglei" , "edk2-devel@lists.01.org" CC: "Justen, Jordan L" , Andrew Fish Thread-Topic: [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Thread-Index: AQHUdLTT/2apr3ZHH0Cjp71Cp7l2/aVAt5CA Date: Mon, 5 Nov 2018 06:26:06 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BEF1250@SHSMSX104.ccr.corp.intel.com> References: <20181105030807.27420-1-shenglei.zhang@intel.com> <20181105030807.27420-4-shenglei.zhang@intel.com> In-Reply-To: <20181105030807.27420-4-shenglei.zhang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC 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:26:11 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ruiyu Ni I just submitted another Bugzilla: https://bugzilla.tianocore.org/show_bug.= cgi?id=3D1298 It's to request to remove PcdShellFile from platfrom DSC. Thanks/Ray > -----Original Message----- > From: Zhang, Shenglei > Sent: Monday, November 5, 2018 11:08 AM > To: edk2-devel@lists.01.org > Cc: Zhang, Shenglei ; Justen, Jordan L > ; Ni, Ruiyu ; Andrew Fish > > Subject: [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC >=20 > From: shenglei >=20 > Remove EdkShellBinPkg in EmulatorPkg.dec and EmulatorPkg.fdf. > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1108 >=20 > v2: Remove USE_OLD_SHELL in DSC because it will be > unnecessary to use it. >=20 > Cc: Jordan Justen > Cc: Ruiyu Ni > Cc: Andrew Fish > Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Shenglei Zhang > Reviewed-by: Jordan Justen > --- > EmulatorPkg/EmulatorPkg.dec | 2 +- > EmulatorPkg/EmulatorPkg.dsc | 4 ---- > EmulatorPkg/EmulatorPkg.fdf | 4 ---- > 3 files changed, 1 insertion(+), 9 deletions(-) >=20 > diff --git a/EmulatorPkg/EmulatorPkg.dec b/EmulatorPkg/EmulatorPkg.dec > index 25f79c92c9..9be8a90e5b 100644 > --- a/EmulatorPkg/EmulatorPkg.dec > +++ b/EmulatorPkg/EmulatorPkg.dec > @@ -96,7 +96,7 @@ >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0 > x00001001 >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP > Window"|VOID*|0x00001018 > - > gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBi > nPkg/bin/ia32/Apps"|VOID*|0x00001004 > + > gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L"."|VOID*|0x00001004 >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x0 > 0001002 >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x > 0000100d >=20 > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index c8c444fe1c..445777c0f3 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -196,9 +196,7 @@ > # Change PcdBootManagerMenuFile to UiApp > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, > 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0= x66, > 0x23, 0x31 } >=20 > -!ifndef $(USE_OLD_SHELL) > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, > 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0= xB4, > 0xD1 } -!endif >=20 > #define BOOT_WITH_FULL_CONFIGURATION 0x00 > #define BOOT_WITH_MINIMAL_CONFIGURATION 0x01 > @@ -393,7 +391,6 @@ >=20 > FatPkg/EnhancedFatDxe/Fat.inf >=20 > -!ifndef $(USE_OLD_SHELL) >=20 > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand. > inf { > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > @@ -421,7 +418,6 @@ > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > } > -!endif >=20 > !endif >=20 > diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf > index 5b5f81443d..915321eb7a 100644 > --- a/EmulatorPkg/EmulatorPkg.fdf > +++ b/EmulatorPkg/EmulatorPkg.fdf > @@ -208,12 +208,8 @@ INF > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >=20 > INF FatPkg/EnhancedFatDxe/Fat.inf >=20 > -!ifndef $(USE_OLD_SHELL) > INF > ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand. > inf > INF ShellPkg/Application/Shell/Shell.inf > -!else > -INF RuleOverride =3D BINARY EdkShellBinPkg/FullShell/FullShell.inf > -!endif >=20 > [Rule.Common.SEC] > FILE SEC =3D $(NAMED_GUID) { > -- > 2.18.0.windows.1