* [PATCH v3 1/5] Nt32Pkg: Remove EdkShellBinPkg in FDF, DSC and DEC
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
@ 2018-11-05 3:08 ` Shenglei Zhang
2018-11-05 6:27 ` Ni, Ruiyu
2018-11-05 3:08 ` [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg Shenglei Zhang
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Shenglei Zhang @ 2018-11-05 3:08 UTC (permalink / raw)
To: edk2-devel; +Cc: shenglei, Ruiyu Ni
From: shenglei <shenglei.zhang@intel.com>
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>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
Nt32Pkg/Nt32Pkg.dec | 2 +-
Nt32Pkg/Nt32Pkg.dsc | 6 ++----
Nt32Pkg/Nt32Pkg.fdf | 4 ----
3 files changed, 3 insertions(+), 9 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..727349d6cd 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -280,9 +280,7 @@
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 +314,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
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 1/5] Nt32Pkg: Remove EdkShellBinPkg in FDF, DSC and DEC
2018-11-05 3:08 ` [PATCH v3 1/5] Nt32Pkg: " Shenglei Zhang
@ 2018-11-05 6:27 ` Ni, Ruiyu
0 siblings, 0 replies; 13+ messages in thread
From: Ni, Ruiyu @ 2018-11-05 6:27 UTC (permalink / raw)
To: Zhang, Shenglei, edk2-devel@lists.01.org
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Thanks/Ray
> -----Original Message-----
> From: Zhang, Shenglei <shenglei.zhang@intel.com>
> Sent: Monday, November 5, 2018 11:08 AM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Shenglei <shenglei.zhang@intel.com>; Ni, Ruiyu
> <ruiyu.ni@intel.com>
> Subject: [PATCH v3 1/5] Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and
> DEC
>
> From: shenglei <shenglei.zhang@intel.com>
>
> 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>
> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> Nt32Pkg/Nt32Pkg.dec | 2 +-
> Nt32Pkg/Nt32Pkg.dsc | 6 ++----
> Nt32Pkg/Nt32Pkg.fdf | 4 ----
> 3 files changed, 3 insertions(+), 9 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*|0
> x00001002
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA
> Window 2"|VOID*|0x00001003
> -
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShell
> BinPkg\\bin\\ia32\\Apps"|VOID*|0x00001004
> +
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|0x00001004
>
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x000
> 01005
> 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..727349d6cd 100644
> --- a/Nt32Pkg/Nt32Pkg.dsc
> +++ b/Nt32Pkg/Nt32Pkg.dsc
> @@ -280,9 +280,7 @@
> 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 +314,10 @@
> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
>
> [PcdsDynamicDefault.Ia32]
> -
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinP
> kg\Bin\Ia32\Apps"|VOID*|106
> + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|106
>
> [PcdsDynamicDefault.x64]
> -
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\..\..\..\EdkShellBinP
> kg\Bin\X64\Apps"|VOID*|106
> + gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|106
>
> [PcdsDynamicHii.common.DEFAULT]
>
> gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn|L"SetupCons
> oleConfig"|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/BootManagerMenuAp
> p.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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
2018-11-05 3:08 ` [PATCH v3 1/5] Nt32Pkg: " Shenglei Zhang
@ 2018-11-05 3:08 ` Shenglei Zhang
2018-11-05 3:34 ` Wei, David
2018-11-05 3:08 ` [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Shenglei Zhang
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Shenglei Zhang @ 2018-11-05 3:08 UTC (permalink / raw)
To: edk2-devel; +Cc: shenglei, David Wei, zailiang sun
From: shenglei <shenglei.zhang@intel.com>
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>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: David Wei <david.wei@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
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
2018-11-05 3:08 ` [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg Shenglei Zhang
@ 2018-11-05 3:34 ` Wei, David
0 siblings, 0 replies; 13+ messages in thread
From: Wei, David @ 2018-11-05 3:34 UTC (permalink / raw)
To: Zhang, Shenglei, edk2-devel@lists.01.org; +Cc: Sun, Zailiang
Reviewed-by: David Wei <david.wei@intel.com>
Thanks,
David Wei
Intel SSG/STO/UEFI BIOS
-----Original Message-----
From: Zhang, Shenglei
Sent: Monday, November 5, 2018 11:08 AM
To: edk2-devel@lists.01.org
Cc: Zhang, Shenglei <shenglei.zhang@intel.com>; Wei, David <david.wei@intel.com>; Sun, Zailiang <zailiang.sun@intel.com>
Subject: [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
From: shenglei <shenglei.zhang@intel.com>
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>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: David Wei <david.wei@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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
2018-11-05 3:08 ` [PATCH v3 1/5] Nt32Pkg: " Shenglei Zhang
2018-11-05 3:08 ` [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg Shenglei Zhang
@ 2018-11-05 3:08 ` Shenglei Zhang
2018-11-05 6:26 ` Ni, Ruiyu
2018-11-05 3:08 ` [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF Shenglei Zhang
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Shenglei Zhang @ 2018-11-05 3:08 UTC (permalink / raw)
To: edk2-devel; +Cc: shenglei, Jordan Justen, Ruiyu Ni, Andrew Fish
From: shenglei <shenglei.zhang@intel.com>
Remove EdkShellBinPkg in EmulatorPkg.dec and
EmulatorPkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108
v2: Remove USE_OLD_SHELL in DSC because it will be
unnecessary to use it.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Andrew Fish <afish@apple.com>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---
EmulatorPkg/EmulatorPkg.dec | 2 +-
EmulatorPkg/EmulatorPkg.dsc | 4 ----
EmulatorPkg/EmulatorPkg.fdf | 4 ----
3 files changed, 1 insertion(+), 9 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.dsc b/EmulatorPkg/EmulatorPkg.dsc
index c8c444fe1c..445777c0f3 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -196,9 +196,7 @@
# Change PcdBootManagerMenuFile to UiApp
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
-!ifndef $(USE_OLD_SHELL)
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
-!endif
#define BOOT_WITH_FULL_CONFIGURATION 0x00
#define BOOT_WITH_MINIMAL_CONFIGURATION 0x01
@@ -393,7 +391,6 @@
FatPkg/EnhancedFatDxe/Fat.inf
-!ifndef $(USE_OLD_SHELL)
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
<PcdsFixedAtBuild>
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@@ -421,7 +418,6 @@
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
}
-!endif
!endif
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
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
2018-11-05 3:08 ` [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Shenglei Zhang
@ 2018-11-05 6:26 ` Ni, Ruiyu
0 siblings, 0 replies; 13+ messages in thread
From: Ni, Ruiyu @ 2018-11-05 6:26 UTC (permalink / raw)
To: Zhang, Shenglei, edk2-devel@lists.01.org; +Cc: Justen, Jordan L, Andrew Fish
Reviewed-by: Ruiyu Ni <Ruiyu.ni@intel.com>
I just submitted another Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1298
It's to request to remove PcdShellFile from platfrom DSC.
Thanks/Ray
> -----Original Message-----
> From: Zhang, Shenglei <shenglei.zhang@intel.com>
> Sent: Monday, November 5, 2018 11:08 AM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Shenglei <shenglei.zhang@intel.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>; Andrew Fish
> <afish@apple.com>
> Subject: [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
>
> From: shenglei <shenglei.zhang@intel.com>
>
> Remove EdkShellBinPkg in EmulatorPkg.dec and EmulatorPkg.fdf.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
>
> v2: Remove USE_OLD_SHELL in DSC because it will be
> unnecessary to use it.
>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Andrew Fish <afish@apple.com>
> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
> EmulatorPkg/EmulatorPkg.dec | 2 +-
> EmulatorPkg/EmulatorPkg.dsc | 4 ----
> EmulatorPkg/EmulatorPkg.fdf | 4 ----
> 3 files changed, 1 insertion(+), 9 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.dsc b/EmulatorPkg/EmulatorPkg.dsc
> index c8c444fe1c..445777c0f3 100644
> --- a/EmulatorPkg/EmulatorPkg.dsc
> +++ b/EmulatorPkg/EmulatorPkg.dsc
> @@ -196,9 +196,7 @@
> # Change PcdBootManagerMenuFile to UiApp
> gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21,
> 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66,
> 0x23, 0x31 }
>
> -!ifndef $(USE_OLD_SHELL)
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5,
> 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4,
> 0xD1 } -!endif
>
> #define BOOT_WITH_FULL_CONFIGURATION 0x00
> #define BOOT_WITH_MINIMAL_CONFIGURATION 0x01
> @@ -393,7 +391,6 @@
>
> FatPkg/EnhancedFatDxe/Fat.inf
>
> -!ifndef $(USE_OLD_SHELL)
>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -421,7 +418,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !endif
>
> 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
` (2 preceding siblings ...)
2018-11-05 3:08 ` [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Shenglei Zhang
@ 2018-11-05 3:08 ` Shenglei Zhang
2018-11-05 21:50 ` Laszlo Ersek
2018-11-05 3:08 ` [PATCH v3 5/5] CorebootPayloadPkg: " Shenglei Zhang
2018-11-05 16:45 ` [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Laszlo Ersek
5 siblings, 1 reply; 13+ messages in thread
From: Shenglei Zhang @ 2018-11-05 3:08 UTC (permalink / raw)
To: edk2-devel; +Cc: shenglei, Jordan Justen, Laszlo Ersek, Ard Biesheuvel
From: shenglei <shenglei.zhang@intel.com>
Remove EdkShellBinPkg in OvmfPkgIa32.fdf,
OvmfPkg/OvmfPkgIa32X64.fdf amd OvmfPkg/OvmfPkgX64.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108
v2: Remove USE_OLD_SHELL in DSC because it will be
unnecessary to use it.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
---
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
OvmfPkg/OvmfPkgIa32.fdf | 4 ----
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
OvmfPkg/OvmfPkgIa32X64.fdf | 4 ----
OvmfPkg/OvmfPkgX64.dsc | 4 ----
OvmfPkg/OvmfPkgX64.fdf | 4 ----
6 files changed, 24 deletions(-)
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 9f07e75050..617e51350f 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -510,9 +510,7 @@
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 $(SMM_REQUIRE) == TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
@@ -837,7 +835,6 @@
OvmfPkg/Csm/Csm16/Csm16.inf
!endif
-!ifndef $(USE_OLD_SHELL)
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
<PcdsFixedAtBuild>
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@@ -864,7 +861,6 @@
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
}
-!endif
!if $(SECURE_BOOT_ENABLE) == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
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.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index a4eaeb808c..7e2c71d4e6 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -516,9 +516,7 @@
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 $(SMM_REQUIRE) == TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
@@ -846,7 +844,6 @@
OvmfPkg/Csm/Csm16/Csm16.inf
!endif
-!ifndef $(USE_OLD_SHELL)
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
<PcdsFixedAtBuild>
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@@ -873,7 +870,6 @@
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
}
-!endif
!if $(SECURE_BOOT_ENABLE) == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.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.dsc b/OvmfPkg/OvmfPkgX64.dsc
index aa3efc5e73..2fcd293235 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -515,9 +515,7 @@
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 $(SMM_REQUIRE) == TRUE
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
@@ -844,7 +842,6 @@
OvmfPkg/Csm/Csm16/Csm16.inf
!endif
-!ifndef $(USE_OLD_SHELL)
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
<PcdsFixedAtBuild>
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@@ -871,7 +868,6 @@
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
}
-!endif
!if $(SECURE_BOOT_ENABLE) == TRUE
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.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
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF
2018-11-05 3:08 ` [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF Shenglei Zhang
@ 2018-11-05 21:50 ` Laszlo Ersek
2018-11-05 21:53 ` Laszlo Ersek
0 siblings, 1 reply; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-05 21:50 UTC (permalink / raw)
To: Shenglei Zhang, edk2-devel; +Cc: Jordan Justen
On 11/05/18 04:08, Shenglei Zhang wrote:
> From: shenglei <shenglei.zhang@intel.com>
>
> Remove EdkShellBinPkg in OvmfPkgIa32.fdf,
> OvmfPkg/OvmfPkgIa32X64.fdf amd OvmfPkg/OvmfPkgX64.fdf.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
>
> v2: Remove USE_OLD_SHELL in DSC because it will be
> unnecessary to use it.
>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
(1) Please remove the Change-Id line from the commit message.
(2) In order to be consistent with the other subject lines in the patch
set, I suggest updating "FDF" to "FDF and DSC". (See the Nt32Pkg patch
in particular.)
IMO these can be implemented right before pushing the patch.
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Hmm... OK, I see Jordan's R-b is coming from
<https://lists.01.org/pipermail/edk2-devel/2018-November/031736.html>.
Thank you Jordan! (And it seems like the S-o-b has been fixed indeed.)
With (1) and (2) addressed:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks
Laszlo
> ---
> OvmfPkg/OvmfPkgIa32.dsc | 4 ----
> OvmfPkg/OvmfPkgIa32.fdf | 4 ----
> OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
> OvmfPkg/OvmfPkgIa32X64.fdf | 4 ----
> OvmfPkg/OvmfPkgX64.dsc | 4 ----
> OvmfPkg/OvmfPkgX64.fdf | 4 ----
> 6 files changed, 24 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 9f07e75050..617e51350f 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -510,9 +510,7 @@
> 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 $(SMM_REQUIRE) == TRUE
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> @@ -837,7 +835,6 @@
> OvmfPkg/Csm/Csm16/Csm16.inf
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -864,7 +861,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> 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.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index a4eaeb808c..7e2c71d4e6 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -516,9 +516,7 @@
> 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 $(SMM_REQUIRE) == TRUE
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> @@ -846,7 +844,6 @@
> OvmfPkg/Csm/Csm16/Csm16.inf
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -873,7 +870,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.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.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index aa3efc5e73..2fcd293235 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -515,9 +515,7 @@
> 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 $(SMM_REQUIRE) == TRUE
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> @@ -844,7 +842,6 @@
> OvmfPkg/Csm/Csm16/Csm16.inf
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -871,7 +868,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.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
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF
2018-11-05 21:50 ` Laszlo Ersek
@ 2018-11-05 21:53 ` Laszlo Ersek
0 siblings, 0 replies; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-05 21:53 UTC (permalink / raw)
To: Shenglei Zhang, edk2-devel; +Cc: Jordan Justen
On 11/05/18 22:50, Laszlo Ersek wrote:
> On 11/05/18 04:08, Shenglei Zhang wrote:
>> From: shenglei <shenglei.zhang@intel.com>
>>
>> Remove EdkShellBinPkg in OvmfPkgIa32.fdf,
>> OvmfPkg/OvmfPkgIa32X64.fdf amd OvmfPkg/OvmfPkgX64.fdf.
>> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
>>
>> v2: Remove USE_OLD_SHELL in DSC because it will be
>> unnecessary to use it.
>>
>> Cc: Jordan Justen <jordan.l.justen@intel.com>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
>
> (1) Please remove the Change-Id line from the commit message.
>
> (2) In order to be consistent with the other subject lines in the patch
> set, I suggest updating "FDF" to "FDF and DSC". (See the Nt32Pkg patch
> in particular.)
(and then update the commit message body too pls; it currently only
mentions the FDF files)
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v3 5/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
` (3 preceding siblings ...)
2018-11-05 3:08 ` [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF Shenglei Zhang
@ 2018-11-05 3:08 ` Shenglei Zhang
2018-11-05 6:04 ` You, Benjamin
2018-11-05 16:45 ` [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Laszlo Ersek
5 siblings, 1 reply; 13+ messages in thread
From: Shenglei Zhang @ 2018-11-05 3:08 UTC (permalink / raw)
To: edk2-devel; +Cc: shenglei, Maurice Ma, Prince Agyeman, Benjamin You
From: shenglei <shenglei.zhang@intel.com>
Remove EdkShellBinPkg in CorebootPayloadPkg.fdf.
https://bugzilla.tianocore.org/show_bug.cgi?id=1108
v3:Remove FULL_BIN and change SHELL_TYPE from FULL_BIN
to UEFI_BIN.
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 ++-------
CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 9 ++-------
3 files changed, 4 insertions(+), 22 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
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index 7d5052be93..467d4fcdb4 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -83,9 +83,9 @@
DEFINE USE_HPET_TIMER = FALSE
#
- # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
+ # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
#
- DEFINE SHELL_TYPE = FULL_BIN
+ DEFINE SHELL_TYPE = UEFI_BIN
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
@@ -327,13 +327,8 @@
#
# Set the proper Shell file GUID
#
- !if $(SHELL_TYPE) == FULL_BIN
- # c57ad6b7-0515-40a8-9d21-551652854e37
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }
- !else
# 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
- !endif
################################################################################
#
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 0484e941cc..673bd26c79 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -83,9 +83,9 @@
DEFINE USE_HPET_TIMER = FALSE
#
- # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
+ # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
#
- DEFINE SHELL_TYPE = FULL_BIN
+ DEFINE SHELL_TYPE = UEFI_BIN
[BuildOptions]
*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
@@ -328,13 +328,8 @@
#
# Set the proper Shell file GUID
#
- !if $(SHELL_TYPE) == FULL_BIN
- # c57ad6b7-0515-40a8-9d21-551652854e37
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6, 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }
- !else
# 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
- !endif
################################################################################
#
--
2.18.0.windows.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3 5/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
2018-11-05 3:08 ` [PATCH v3 5/5] CorebootPayloadPkg: " Shenglei Zhang
@ 2018-11-05 6:04 ` You, Benjamin
0 siblings, 0 replies; 13+ messages in thread
From: You, Benjamin @ 2018-11-05 6:04 UTC (permalink / raw)
To: Zhang, Shenglei, edk2-devel@lists.01.org; +Cc: Ma, Maurice, Agyeman, Prince
Reviewed-by: Benjamin You <benjamin.you@intel.com>
> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Monday, November 5, 2018 11:08 AM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Shenglei <shenglei.zhang@intel.com>; Ma, Maurice
> <maurice.ma@intel.com>; Agyeman, Prince <prince.agyeman@intel.com>; You,
> Benjamin <benjamin.you@intel.com>
> Subject: [PATCH v3 5/5] CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
>
> From: shenglei <shenglei.zhang@intel.com>
>
> Remove EdkShellBinPkg in CorebootPayloadPkg.fdf.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
>
> v3:Remove FULL_BIN and change SHELL_TYPE from FULL_BIN
> to UEFI_BIN.
>
> Cc: Maurice Ma <maurice.ma@intel.com>
> Cc: Prince Agyeman <prince.agyeman@intel.com>
> Cc: Benjamin You <benjamin.you@intel.com>
> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
> CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 ++-------
> CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 9 ++-------
> 3 files changed, 4 insertions(+), 22 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
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> index 7d5052be93..467d4fcdb4 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> @@ -83,9 +83,9 @@
> DEFINE USE_HPET_TIMER = FALSE
>
> #
> - # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
> + # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
> #
> - DEFINE SHELL_TYPE = FULL_BIN
> + DEFINE SHELL_TYPE = UEFI_BIN
>
> [BuildOptions]
> *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> @@ -327,13 +327,8 @@
> #
> # Set the proper Shell file GUID
> #
> - !if $(SHELL_TYPE) == FULL_BIN
> - # c57ad6b7-0515-40a8-9d21-551652854e37
> - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6,
> 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E,
> 0x37 }
> - !else
> # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5,
> 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4,
> 0xD1 }
> - !endif
>
>
> #################################################################
> ###############
> #
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> index 0484e941cc..673bd26c79 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> @@ -83,9 +83,9 @@
> DEFINE USE_HPET_TIMER = FALSE
>
> #
> - # Shell options: [BUILD_SHELL, FULL_BIN, MIN_BIN, NONE, UEFI]
> + # Shell options: [BUILD_SHELL, MIN_BIN, NONE, UEFI]
> #
> - DEFINE SHELL_TYPE = FULL_BIN
> + DEFINE SHELL_TYPE = UEFI_BIN
>
> [BuildOptions]
> *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> @@ -328,13 +328,8 @@
> #
> # Set the proper Shell file GUID
> #
> - !if $(SHELL_TYPE) == FULL_BIN
> - # c57ad6b7-0515-40a8-9d21-551652854e37
> - gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0xB7, 0xD6,
> 0x7A, 0xC5, 0x15, 0x05, 0xA8, 0x40, 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E,
> 0x37 }
> - !else
> # 7C04A583-9E3E-4f1c-AD65-E05268D0B4D1
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5,
> 0x04, 0x7C, 0x3E, 0x9E, 0x1c, 0x4f, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4,
> 0xD1 }
> - !endif
>
>
> #################################################################
> ###############
> #
> --
> 2.18.0.windows.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
` (4 preceding siblings ...)
2018-11-05 3:08 ` [PATCH v3 5/5] CorebootPayloadPkg: " Shenglei Zhang
@ 2018-11-05 16:45 ` Laszlo Ersek
5 siblings, 0 replies; 13+ messages in thread
From: Laszlo Ersek @ 2018-11-05 16:45 UTC (permalink / raw)
To: Shenglei Zhang, edk2-devel
On 11/05/18 04:08, Shenglei Zhang wrote:
> Remove EdkShellBinPkg in CorebootPayloadPkg, EmulatorPkg, Nt32Pkg
> and OvmfPkg. Replace EdkShellBinPkg with EdkShellPkg in
> Vlv2TbltDevicePkg.
>
> v2: Remove 'USE_OLD_SHELL' in dsc files.
>
> v3: Remove FULL_BIN and change SHELL_TYPE from FULL_BIN
> to UEFI_BIN.
>
> shenglei (5):
> Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and DEC
> Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg
> EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC
> OvmfPkg: Remove EdkShellBinPkg in FDF
> CorebootPayloadPkg: Remove EdkShellBinPkg in FDF
>
> CorebootPayloadPkg/CorebootPayloadPkg.fdf | 8 --------
> CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc | 9 ++-------
> CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 9 ++-------
> EmulatorPkg/EmulatorPkg.dec | 2 +-
> EmulatorPkg/EmulatorPkg.dsc | 4 ----
> EmulatorPkg/EmulatorPkg.fdf | 4 ----
> Nt32Pkg/Nt32Pkg.dec | 2 +-
> Nt32Pkg/Nt32Pkg.dsc | 6 ++----
> Nt32Pkg/Nt32Pkg.fdf | 4 ----
> OvmfPkg/OvmfPkgIa32.dsc | 4 ----
> OvmfPkg/OvmfPkgIa32.fdf | 4 ----
> OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
> OvmfPkg/OvmfPkgIa32X64.fdf | 4 ----
> OvmfPkg/OvmfPkgX64.dsc | 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 +
> 20 files changed, 13 insertions(+), 72 deletions(-)
>
In the cover letter, you have to manually CC all people from the
individual patches. Please collect all the CC's from the individual
patches, sort them uniquely, and add them to the cover letter. The cover
letter is relevant to everyone that receives at least one patch from the
series. For two reasons:
- the cover letter explains the high level goal of the changes
- the cover letter serves as the anchor point for collecting the patches
in the series into a single thread in the MUA's threaded view.
You haven't CC'd me on the cover letter, and now your patches (from
three versions of the patch set) are scattered between the 300+ emails
that I now have to process after being away for a little while.
At least I managed to find the latest-looking (v3) cover letter in my
edk2-devel list folder. Will follow up later.
Laszlo
^ permalink raw reply [flat|nested] 13+ messages in thread