From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: dandan.bi@intel.com) Received: from mga11.intel.com (mga11.intel.com []) by groups.io with SMTP; Tue, 09 Apr 2019 22:33:44 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 22:33:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,332,1549958400"; d="scan'208";a="141463616" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by orsmga003.jf.intel.com with ESMTP; 09 Apr 2019 22:33:43 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Shifei A Lu , Xiaohu Zhou , Isaac W Oram Subject: [edk2-platforms/devel-MinPlatform] [patch 3/3] PurleyOpenBoardPkg/BoardMtOlympus: Use shell source directly Date: Wed, 10 Apr 2019 13:33:02 +0800 Message-Id: <20190410053302.18856-4-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190410053302.18856-1-dandan.bi@intel.com> References: <20190410053302.18856-1-dandan.bi@intel.com> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1675 In long term we will remove ShellBinPkg, so now update platform to use ShellPkg directly. Cc: Shifei A Lu Cc: Xiaohu Zhou Cc: Isaac W Oram Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../BoardMtOlympus/PlatformPkg.dsc | 22 ++++++++++++++++++- .../BoardMtOlympus/PlatformPkg.fdf | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc index 384e70a832..aa8bde5460 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc @@ -225,11 +225,31 @@ AdvancedFeaturePkg/Smbios/SmbiosBasicDxe/SmbiosBasicDxe.inf !endif PurleyOpenBoardPkg/Policy/S3NvramSave/S3NvramSave.inf - ShellBinPkg/UefiShell/UefiShell.inf + # + # Shell + # + ShellPkg/Application/Shell/Shell.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + + NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf + NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf + NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf + NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf + NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf + NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf + NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf + NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf + BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf + ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + } MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf index 610aa18d49..0100f88aa3 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.fdf @@ -297,11 +297,11 @@ INF $(BOARD_PKG)/Policy/IioUdsDataDxe/IioUdsDataDxe.inf INF $(BOARD_PKG)/Policy/PlatformCpuPolicy/PlatformCpuPolicy.inf INF $(BOARD_PKG)/Pci/PciPlatform/PciPlatform.inf INF MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf -INF ShellBinPkg/UefiShell/UefiShell.inf +INF ShellPkg/Application/Shell/Shell.inf INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf -- 2.18.0.windows.1