Re: [edk2] [PATCH v3 1/5] Nt32Pkg: Remove EdkShellBinPkg in FDF, DSC and DEC

2018-11-04 Thread Ni, Ruiyu
Reviewed-by: Ruiyu Ni 

Thanks/Ray

> -Original Message-
> From: Zhang, Shenglei 
> Sent: Monday, November 5, 2018 11:08 AM
> To: edk2-devel@lists.01.org
> Cc: Zhang, Shenglei ; Ni, Ruiyu
> 
> Subject: [PATCH v3 1/5] Nt32Pkg: Remove EdkShellBinPkg in FDF,DSC and
> DEC
> 
> From: shenglei 
> 
> Remove EdkShellBinPkg in Nt32Pkg.dec, Nt32Pkg.dsc and Nt32Pkg.fdf.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
> 
> Cc: Ruiyu Ni 
> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang 
> ---
>  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*|
> 0x1001
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|0
> x1002
>gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA
> Window 2"|VOID*|0x1003
> -
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShell
> BinPkg\\bin\\ia32\\Apps"|VOID*|0x1004
> +
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|0x1004
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x000
> 01005
>gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console
> Window"|VOID*|0x100a
>gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA
> Window 2"|VOID*|0x100d 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

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel


[edk2] [PATCH v3 1/5] Nt32Pkg: Remove EdkShellBinPkg in FDF, DSC and DEC

2018-11-04 Thread Shenglei Zhang
From: shenglei 

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

Cc: Ruiyu Ni 
Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang 
---
 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*|0x1001
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtSerialPort|L"COM1!COM2"|VOID*|0x1002
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtUga|L"UGA Window 1!UGA Window 
2"|VOID*|0x1003
-  
gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L".!..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"|VOID*|0x1004
+  gEfiNt32PkgTokenSpaceGuid.PcdWinNtFileSystem|L"."|VOID*|0x1004
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtMemorySize|L"64!64"|VOID*|0x1005
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtConsole|L"Bus Driver Console 
Window"|VOID*|0x100a
   gEfiNt32PkgTokenSpaceGuid.PcdWinNtGop|L"UGA Window 1!UGA Window 
2"|VOID*|0x100d
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

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel