[PATCH 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC

[PATCH 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC

[shenglei]

Remove EdkShellBinPkg in CorebootPayloadPkg, EmulatorPkg, Nt32Pkg
and OvmfPkg. Replace EdkShellBinPkg with EdkShellPkg in
Vlv2TbltDevicePkg.

shenglei (5):
  CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
  EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
  Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and DEC
  OvmfPkg: Remove EdkShellBinPkg in FDF
  Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg

 CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
 EmulatorPkg/EmulatorPkg.dec               | 2 +-
 EmulatorPkg/EmulatorPkg.fdf               | 4 ----
 Nt32Pkg/Nt32Pkg.dec                       | 2 +-
 Nt32Pkg/Nt32Pkg.dsc                       | 4 ++--
 Nt32Pkg/Nt32Pkg.fdf                       | 4 ----
 OvmfPkg/OvmfPkgIa32.fdf                   | 4 ----
 OvmfPkg/OvmfPkgIa32X64.fdf                | 4 ----
 OvmfPkg/OvmfPkgX64.fdf                    | 4 ----
 Vlv2TbltDevicePkg/PlatformPkg.fdf         | 5 +----
 Vlv2TbltDevicePkg/PlatformPkgGcc.fdf      | 5 +----
 Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   | 1 +
 Vlv2TbltDevicePkg/PlatformPkgIA32.dsc     | 1 +
 Vlv2TbltDevicePkg/PlatformPkgX64.dsc      | 1 +
 14 files changed, 9 insertions(+), 40 deletions(-)

-- 
2.18.0.windows.1

[PATCH 1/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF

[shenglei]

Remove EdkShellBinPkg in CorebootPayloadPkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
 1 file changed, 8 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
-- 
2.18.0.windows.1

[PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC

[shenglei]

Remove EdkShellBinPkg in EmulatorPkg.dec and
EmulatorPkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 EmulatorPkg/EmulatorPkg.dec | 2 +-
 EmulatorPkg/EmulatorPkg.fdf | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/EmulatorPkg/EmulatorPkg.dec b/EmulatorPkg/EmulatorPkg.dec
index 25f79c92c9..9be8a90e5b 100644
--- a/EmulatorPkg/EmulatorPkg.dec
+++ b/EmulatorPkg/EmulatorPkg.dec
@@ -96,7 +96,7 @@
   gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0x00001001
 
   gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP Window"|VOID*|0x00001018
-  gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBinPkg/bin/ia32/Apps"|VOID*|0x00001004
+  gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L"."|VOID*|0x00001004
   gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x00001002
   gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x0000100d
 
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 5b5f81443d..915321eb7a 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -208,12 +208,8 @@ INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
 
 INF FatPkg/EnhancedFatDxe/Fat.inf
 
-!ifndef $(USE_OLD_SHELL)
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
-!else
-INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-!endif
 
 [Rule.Common.SEC]
   FILE SEC = $(NAMED_GUID)  {
-- 
2.18.0.windows.1

[PATCH 3/5] Nt32Pkg: Remove EdkShellBinPkg in FDF, DSC and DEC

[shenglei]

Remove EdkShellBinPkg in Nt32Pkg.dec, Nt32Pkg.dsc
and Nt32Pkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 Nt32Pkg/Nt32Pkg.dec | 2 +-
 Nt32Pkg/Nt32Pkg.dsc | 4 ++--
 Nt32Pkg/Nt32Pkg.fdf | 4 ----
 3 files changed, 3 insertions(+), 7 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 58d9f8787d..089dec191e 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -316,10 +316,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 db2719fd99..d1b856b5a3 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -288,11 +288,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
-- 
2.18.0.windows.1

[PATCH 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF

[shenglei]

Remove EdkShellBinPkg in OvmfPkgIa32.fdf,
OvmfPkg/OvmfPkgIa32X64.fdf amd OvmfPkg/OvmfPkgX64.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 OvmfPkg/OvmfPkgIa32.fdf    | 4 ----
 OvmfPkg/OvmfPkgIa32X64.fdf | 4 ----
 OvmfPkg/OvmfPkgX64.fdf     | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 52b8b1fea1..1646281299 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -288,12 +288,8 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 
-!ifndef $(USE_OLD_SHELL)
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
-!else
-INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-!endif
 
 INF MdeModulePkg/Logo/LogoDxe.inf
 
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 70845d6972..2a5663abcb 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -289,12 +289,8 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 
-!ifndef $(USE_OLD_SHELL)
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
-!else
-INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
-!endif
 
 INF MdeModulePkg/Logo/LogoDxe.inf
 
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 1eb46ac9a2..2a5663abcb 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -289,12 +289,8 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
 INF  FatPkg/EnhancedFatDxe/Fat.inf
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 
-!ifndef $(USE_OLD_SHELL)
 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
-!else
-INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-!endif
 
 INF MdeModulePkg/Logo/LogoDxe.inf
 
-- 
2.18.0.windows.1

[PATCH 5/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg

[shenglei]

Replace EdkShellBinPkg with ShellPkg in PlatformPkg.fdf,
PlatformPkgGcc.fdf, PlatformPkgGccX64.dsc,
PlatformPkgIA32.dsc and PlatformPkgX64.dsc.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

Cc: David Wei <david.wei@intel.com>
Cc: zailiang sun <zailiang.sun@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 Vlv2TbltDevicePkg/PlatformPkg.fdf       | 5 +----
 Vlv2TbltDevicePkg/PlatformPkgGcc.fdf    | 5 +----
 Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 +
 Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 1 +
 Vlv2TbltDevicePkg/PlatformPkgX64.dsc    | 1 +
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584de..89c488372d 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -709,10 +709,7 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
 #
 # UEFI Shell
 #
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-#    SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-    SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
-  }
+INF  ShellPkg/Application/Shell/Shell.inf
 
 #
 # dp command
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f..e7bbda1a56 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -665,10 +665,7 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
 #
 # UEFI Shell
 #
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-#    SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-    SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
-  }
+INF  ShellPkg/Application/Shell/Shell.inf
 
 #
 # dp command
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee9..af2e701372 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1462,6 +1462,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+  ShellPkg/Application/Shell/Shell.inf
 !if $(SATA_ENABLE) == TRUE
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
 !endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565..38403f8f20 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1450,6 +1450,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+  ShellPkg/Application/Shell/Shell.inf
 !if $(SATA_ENABLE) == TRUE
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
 !endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa63491..13499b7c9e 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1462,6 +1462,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+  ShellPkg/Application/Shell/Shell.inf
 !if $(SATA_ENABLE) == TRUE
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
 !endif
-- 
2.18.0.windows.1

Re: [PATCH 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC

[Jordan Justen]

I also see USE_OLD_SHELL references in the .dsc files.

(Try 'git grep USE_OLD_SHELL')

After the platforms no longer reference EdkShellBinPkg, then the bin
package will be removed?

-Jordan

On 2018-10-30 22:57:06, shenglei wrote:
> Remove EdkShellBinPkg in CorebootPayloadPkg, EmulatorPkg, Nt32Pkg
> and OvmfPkg. Replace EdkShellBinPkg with EdkShellPkg in
> Vlv2TbltDevicePkg.
> 
> shenglei (5):
>   CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
>   EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
>   Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and DEC
>   OvmfPkg: Remove EdkShellBinPkg in FDF
>   Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
> 
>  CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
>  EmulatorPkg/EmulatorPkg.dec               | 2 +-
>  EmulatorPkg/EmulatorPkg.fdf               | 4 ----
>  Nt32Pkg/Nt32Pkg.dec                       | 2 +-
>  Nt32Pkg/Nt32Pkg.dsc                       | 4 ++--
>  Nt32Pkg/Nt32Pkg.fdf                       | 4 ----
>  OvmfPkg/OvmfPkgIa32.fdf                   | 4 ----
>  OvmfPkg/OvmfPkgIa32X64.fdf                | 4 ----
>  OvmfPkg/OvmfPkgX64.fdf                    | 4 ----
>  Vlv2TbltDevicePkg/PlatformPkg.fdf         | 5 +----
>  Vlv2TbltDevicePkg/PlatformPkgGcc.fdf      | 5 +----
>  Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   | 1 +
>  Vlv2TbltDevicePkg/PlatformPkgIA32.dsc     | 1 +
>  Vlv2TbltDevicePkg/PlatformPkgX64.dsc      | 1 +
>  14 files changed, 9 insertions(+), 40 deletions(-)
> 
> -- 
> 2.18.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC

[Ni, Ruiyu]

Shenglei,
The patch is not complete for removing EDK SHELL from EmulatorPkg.
Please also review all references of "USE_OLD_SHELL" and remove the related contents.

Same comments apply to the changes to other platforms.

Thanks/Ray

> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Wednesday, October 31, 2018 1:57 PM
> To: edk2-devel@lists.01.org
> Cc: Justen, Jordan L <jordan.l.justen@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>; Andrew Fish <afish@apple.com>
> Subject: [PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
> 
> Remove EdkShellBinPkg in EmulatorPkg.dec and EmulatorPkg.fdf.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
> 
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: shenglei <shenglei.zhang@intel.com>
> ---
>  EmulatorPkg/EmulatorPkg.dec | 2 +-
>  EmulatorPkg/EmulatorPkg.fdf | 4 ----
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/EmulatorPkg/EmulatorPkg.dec b/EmulatorPkg/EmulatorPkg.dec
> index 25f79c92c9..9be8a90e5b 100644
> --- a/EmulatorPkg/EmulatorPkg.dec
> +++ b/EmulatorPkg/EmulatorPkg.dec
> @@ -96,7 +96,7 @@
> 
> gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0
> x00001001
> 
>    gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP
> Window"|VOID*|0x00001018
> -
> gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBi
> nPkg/bin/ia32/Apps"|VOID*|0x00001004
> +
> gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L"."|VOID*|0x00001004
> 
> gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x0
> 0001002
> 
> gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x
> 0000100d
> 
> diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
> index 5b5f81443d..915321eb7a 100644
> --- a/EmulatorPkg/EmulatorPkg.fdf
> +++ b/EmulatorPkg/EmulatorPkg.fdf
> @@ -208,12 +208,8 @@ INF
> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> 
>  INF FatPkg/EnhancedFatDxe/Fat.inf
> 
> -!ifndef $(USE_OLD_SHELL)
>  INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf
>  INF  ShellPkg/Application/Shell/Shell.inf
> -!else
> -INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> -!endif
> 
>  [Rule.Common.SEC]
>    FILE SEC = $(NAMED_GUID)  {
> --
> 2.18.0.windows.1

Re: [PATCH 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC

[Zhang, Shenglei]

Thanks for your comments about 'USE_OLD_SHELL'. I'll improve the patches in next version.

Shenglei

> -----Original Message-----
> From: Justen, Jordan L
> Sent: Wednesday, October 31, 2018 2:48 PM
> To: edk2-devel@lists.01.org; Zhang, Shenglei <shenglei.zhang@intel.com>
> Subject: Re: [edk2] [PATCH 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC
> 
> I also see USE_OLD_SHELL references in the .dsc files.
> 
> (Try 'git grep USE_OLD_SHELL')
> 
> After the platforms no longer reference EdkShellBinPkg, then the bin
> package will be removed?
> 
> -Jordan
> 
> On 2018-10-30 22:57:06, shenglei wrote:
> > Remove EdkShellBinPkg in CorebootPayloadPkg, EmulatorPkg, Nt32Pkg
> > and OvmfPkg. Replace EdkShellBinPkg with EdkShellPkg in
> > Vlv2TbltDevicePkg.
> >
> > shenglei (5):
> >   CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
> >   EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
> >   Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and DEC
> >   OvmfPkg: Remove EdkShellBinPkg in FDF
> >   Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
> >
> >  CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
> >  EmulatorPkg/EmulatorPkg.dec               | 2 +-
> >  EmulatorPkg/EmulatorPkg.fdf               | 4 ----
> >  Nt32Pkg/Nt32Pkg.dec                       | 2 +-
> >  Nt32Pkg/Nt32Pkg.dsc                       | 4 ++--
> >  Nt32Pkg/Nt32Pkg.fdf                       | 4 ----
> >  OvmfPkg/OvmfPkgIa32.fdf                   | 4 ----
> >  OvmfPkg/OvmfPkgIa32X64.fdf                | 4 ----
> >  OvmfPkg/OvmfPkgX64.fdf                    | 4 ----
> >  Vlv2TbltDevicePkg/PlatformPkg.fdf         | 5 +----
> >  Vlv2TbltDevicePkg/PlatformPkgGcc.fdf      | 5 +----
> >  Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   | 1 +
> >  Vlv2TbltDevicePkg/PlatformPkgIA32.dsc     | 1 +
> >  Vlv2TbltDevicePkg/PlatformPkgX64.dsc      | 1 +
> >  14 files changed, 9 insertions(+), 40 deletions(-)
> >
> > --
> > 2.18.0.windows.1
> >
> > _______________________________________________
> > edk2-devel mailing list
> > edk2-devel@lists.01.org
> > https://lists.01.org/mailman/listinfo/edk2-devel

Re: [PATCH 5/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg

[Wei, David]

Reviewed-by: David Wei <david.wei@intel.com>

Thanks,
David  Wei

Intel SSG/STO/UEFI BIOS                                 

-----Original Message-----
From: Zhang, Shenglei 
Sent: Wednesday, October 31, 2018 1:57 PM
To: edk2-devel@lists.01.org
Cc: Wei, David <david.wei@intel.com>; Sun, Zailiang <zailiang.sun@intel.com>
Subject: [PATCH 5/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg

Replace EdkShellBinPkg with ShellPkg in PlatformPkg.fdf,
PlatformPkgGcc.fdf, PlatformPkgGccX64.dsc,
PlatformPkgIA32.dsc and PlatformPkgX64.dsc.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108

Cc: David Wei <david.wei@intel.com>
Cc: zailiang sun <zailiang.sun@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
---
 Vlv2TbltDevicePkg/PlatformPkg.fdf       | 5 +----
 Vlv2TbltDevicePkg/PlatformPkgGcc.fdf    | 5 +----
 Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 1 +
 Vlv2TbltDevicePkg/PlatformPkgIA32.dsc   | 1 +
 Vlv2TbltDevicePkg/PlatformPkgX64.dsc    | 1 +
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index b7a0e584de..89c488372d 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -709,10 +709,7 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
 #
 # UEFI Shell
 #
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-#    SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-    SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
-  }
+INF  ShellPkg/Application/Shell/Shell.inf
 
 #
 # dp command
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index eca273e33f..e7bbda1a56 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -665,10 +665,7 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
 #
 # UEFI Shell
 #
-FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
-#    SECTION PE32 = EdkShellBinPkg/FullShell/$(EDK_DXE_ARCHITECTURE)/Shell_Full.efi
-    SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
-  }
+INF  ShellPkg/Application/Shell/Shell.inf
 
 #
 # dp command
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 3e3522aee9..af2e701372 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1462,6 +1462,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+  ShellPkg/Application/Shell/Shell.inf
 !if $(SATA_ENABLE) == TRUE
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
 !endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 55c873d565..38403f8f20 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1450,6 +1450,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+  ShellPkg/Application/Shell/Shell.inf
 !if $(SATA_ENABLE) == TRUE
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
 !endif
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index fa6aa63491..13499b7c9e 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1462,6 +1462,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+  ShellPkg/Application/Shell/Shell.inf
 !if $(SATA_ENABLE) == TRUE
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SataController.inf
 !endif
-- 
2.18.0.windows.1