Reviewed-by: Xiaohu Zhou <bowen.z...@intel.com> -----Original Message----- From: Bi, Dandan Sent: Wednesday, April 10, 2019 1:33 PM To: devel@edk2.groups.io Cc: Lu, Shifei A <shifei.a...@intel.com>; Zhou, Bowen <bowen.z...@intel.com>; Oram, Isaac W <isaac.w.o...@intel.com> Subject: [edk2-platforms/devel-MinPlatform] [patch 3/3] PurleyOpenBoardPkg/BoardMtOlympus: Use shell source directly
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 <shifei.a...@intel.com> Cc: Xiaohu Zhou <bowen.z...@intel.com> Cc: Isaac W Oram <isaac.w.o...@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi <dandan...@intel.com> --- .../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 { + <PcdsFixedAtBuild> + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + <LibraryClasses> + 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38811): https://edk2.groups.io/g/devel/message/38811 Mute This Topic: https://groups.io/mt/31016081/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
