From f07afa3e266354be9e194368d15d2db6a4c5d4a4 Mon Sep 17 00:00:00 2001 From: shenglei Date: Wed, 31 Oct 2018 11:04:51 +0800 Subject: [PATCH] Nt32Pkg: Remove EdkShellBinPkg in FDF and DEC Remove EdkShellBinPkg in Nt32Pkg.dec and Nt32Pkg.fdf. https://bugzilla.tianocore.org/show_bug.cgi?id=1108 v2: Remove USE_OLD_SHELL because it will not be used. v4:Remove PcdShellFile in Nt32Pkg.dsc. https://bugzilla.tianocore.org/show_bug.cgi?id=1298 Cc: Ruiyu Ni Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Shenglei Zhang Reviewed-by: Ruiyu Ni --- Nt32Pkg/Nt32Pkg.dec | 2 +- Nt32Pkg/Nt32Pkg.dsc | 7 ++----- Nt32Pkg/Nt32Pkg.fdf | 4 ---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Nt32Pkg/Nt32Pkg.dec b/Nt32Pkg/Nt32Pkg.dec index 06da067bc1..7b2cb8e8d0 100644 --- a/Nt32Pkg/Nt32Pkg.dec +++ b/Nt32Pkg/Nt32Pkg.dec @@ -89,7 +89,7 @@ gEfiNt32PkgTokenSpaceGuid.PcdWinNtVirtualDisk|L"FW;40960;512"|VOID*|0x00001001 gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|0x00001002 gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 2"|VOID*|0x00001003 - gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|0x00001004 + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|0x00001004 gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x00001005 gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console Window"|VOID*|0x0000100a gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 2"|VOID*|0x0000100d diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 4293ca39fd..4dbde0cc45 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -280,9 +280,6 @@ gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE !endif -!ifndef $(USE_OLD_SHELL) - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } -!endif !if $(SECURE_BOOT_ENABLE) == TRUE # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot @@ -316,10 +313,10 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 [PcdsDynamicDefault.Ia32] - gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\Ia32\Apps"|VOID*|106 + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|106 [PcdsDynamicDefault.x64] - gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinPkg\Bin\X64\Apps"|VOID*|106 + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|106 [PcdsDynamicHii.common.DEFAULT] gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|L"SetupConsoleConfig"|gEfiNt32PkgTokenSpaceGuid|0x0|80 diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index 65d9bf812b..b65c95201b 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -284,11 +284,7 @@ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf # for binary shell, binary fat and logo module. # ################################################################################ -!ifndef $(USE_OLD_SHELL) INF ShellPkg/Application/Shell/Shell.inf -!else -INF EdkShellBinPkg/FullShell/FullShell.inf -!endif INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf