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=ruiyu.ni@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 F309A220D4C15 for ; Tue, 28 Nov 2017 00:33:57 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Nov 2017 00:38:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,467,1505804400"; d="scan'208";a="7090367" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.33]) by orsmga003.jf.intel.com with ESMTP; 28 Nov 2017 00:38:19 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Maurice Ma , Prince Agyeman , Benjamin You Date: Tue, 28 Nov 2017 16:38:11 +0800 Message-Id: <20171128083812.59164-6-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.15.0.gvfs.1.preview.4 In-Reply-To: <20171128083812.59164-1-ruiyu.ni@intel.com> References: <20171128083812.59164-1-ruiyu.ni@intel.com> Subject: [PATCH 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: Tue, 28 Nov 2017 08:33:58 -0000 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 | 21 +++++++-------------- CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 21 +++++++-------------- 3 files changed, 17 insertions(+), 29 deletions(-) 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 distribution. # The full text of the license may be found at @@ -180,6 +180,8 @@ [FV.DXEFV] # Shell # !if $(SHELL_TYPE) == BUILD_SHELL +INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf INF ShellPkg/Application/Shell/Shell.inf !endif diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc index cdfcb75b59..d2283bcba4 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 distribution. # The full text of the license may be found at @@ -515,11 +515,6 @@ [Components.IA32] !if $(SHELL_TYPE) == BUILD_SHELL -[PcdsFixedAtBuild] - ## This flag is used to control initialization of the shell library - # This should be FALSE for compiling the shell application itself only. - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - # # Shell Lib # @@ -529,7 +524,13 @@ [LibraryClasses] FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf [Components.IA32] + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf ShellPkg/Application/Shell/Shell.inf { + + ## This flag is used to control initialization of the shell library + # This should be FALSE for compiling the shell application itself only. + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE #------------------------------ # Basic commands @@ -549,14 +550,6 @@ [Components.IA32] NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf - - #------------------------------ - # Performance command - #------------------------------ - - - NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf #------------------------------ # Support libraries diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc index 6b16af63ba..d214da24d6 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 distribution. # The full text of the license may be found at @@ -516,11 +516,6 @@ [Components.X64] !if $(SHELL_TYPE) == BUILD_SHELL -[PcdsFixedAtBuild] - ## This flag is used to control initialization of the shell library - # This should be FALSE for compiling the shell application itself only. - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - # # Shell Lib # @@ -530,7 +525,13 @@ [LibraryClasses] FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf [Components.X64] + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf ShellPkg/Application/Shell/Shell.inf { + + ## This flag is used to control initialization of the shell library + # This should be FALSE for compiling the shell application itself only. + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE #------------------------------ # Basic commands @@ -550,14 +551,6 @@ [Components.X64] NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf - - #------------------------------ - # Performance command - #------------------------------ - - - NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf #------------------------------ # Support libraries -- 2.15.0.gvfs.1.preview.4