From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=shenglei.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 403C321188C59 for ; Sun, 4 Nov 2018 19:08:22 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Nov 2018 19:08:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,466,1534834800"; d="scan'208";a="103403648" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga004.fm.intel.com with ESMTP; 04 Nov 2018 19:08:21 -0800 From: Shenglei Zhang To: edk2-devel@lists.01.org Cc: shenglei , Maurice Ma , Prince Agyeman , Benjamin You Date: Mon, 5 Nov 2018 11:08:07 +0800 Message-Id: <20181105030807.27420-6-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20181105030807.27420-1-shenglei.zhang@intel.com> References: <20181105030807.27420-1-shenglei.zhang@intel.com> Subject: [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 03:08:22 -0000 From: shenglei Remove EdkShellBinPkg in CorebootPayloadPkg.fdf. https://bugzilla.tianocore.org/show_bug.cgi?id=1108 v3:Remove FULL_BIN and change SHELL_TYPE from FULL_BIN to UEFI_BIN. 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(-) 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 -!if $(SHELL_TYPE) == FULL_BIN -!if $(ARCH) == IA32 -INF RuleOverride = BINARY USE = IA32 EdkShellBinPkg/FullShell/FullShell.inf -!else -INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf -!endif -!endif - !if $(SHELL_TYPE) == MIN_BIN !if $(ARCH) == IA32 INF RuleOverride = BINARY USE = 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 = FALSE # - # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI] + # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI] # - DEFINE SHELL_TYPE = FULL_BIN + DEFINE SHELL_TYPE = UEFI_BIN [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES @@ -327,13 +327,8 @@ # # Set the proper Shell file GUID # - !if $(SHELL_TYPE) == FULL_BIN - # c57ad6b7-0515-40a8-9d21-551652854e37 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 } - !else # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } - !endif ################################################################################ # 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 = FALSE # - # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI] + # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI] # - DEFINE SHELL_TYPE = FULL_BIN + DEFINE SHELL_TYPE = UEFI_BIN [BuildOptions] *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES @@ -328,13 +328,8 @@ # # Set the proper Shell file GUID # - !if $(SHELL_TYPE) == FULL_BIN - # c57ad6b7-0515-40a8-9d21-551652854e37 - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 } - !else # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1 gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } - !endif ################################################################################ # -- 2.18.0.windows.1