Change NT32 and DUET to use UEFI Shell by default. Use "-D USE_OLD_SHELL" for NT32...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16444 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/DuetPkg/CreateBootDisk.bat b/DuetPkg/CreateBootDisk.bat
index bd611ee00a7ff6ad1e7a66e938c5e4751a056f49..541de816f2afb5fa41ff5611cd381284ae5700fc 100644 (file)
--- a/DuetPkg/CreateBootDisk.bat
+++ b/DuetPkg/CreateBootDisk.bat
@@ -1,6 +1,6 @@
 @REM ## @file\r
 @REM #\r
-@REM #  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>\r
+@REM #  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>\r
 @REM #\r
 @REM #  This program and the accompanying materials\r
 @REM #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -52,28 +52,25 @@ goto Help
 @format /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL\r
 @del FormatCommandInput.txt\r
 @echo Create boot sector ...\r
-%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
+@%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
 @copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
-%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
+@%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
 @REM @del FDBS.com\r
-%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com \r
+@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com \r
 @del FDBs-1.com\r
 @echo Done.\r
-copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK%\r
-mkdir %EFI_BOOT_DISK%\efi\boot\r
-@if "%PROCESSOR%"=="IA32" goto CreateBootFileForIA32\r
-@if "%PROCESSOR%"=="X64" goto CreateBootFileForX64\r
-@goto end\r
+@copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK%\r
+@goto CreateBootFile\r
 \r
 :CreateFile\r
 @if NOT "%3"=="FAT12" goto WrongFATType\r
 @echo Start to create file boot disk ...\r
 @echo Create boot sector ...\r
 %BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
-copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
-%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
+@copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com\r
+@%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f\r
 @REM @del FDBS.com\r
-%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com \r
+@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com \r
 @del FDBs-1.com\r
 @echo Done.\r
 @goto end\r
@@ -103,10 +100,7 @@ copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com
 \r
 :CreateUsb_FAT16_step2\r
 @copy %BUILD_DIR%\FV\EfiLdr16 %EFI_BOOT_DISK%\r
-@mkdir %EFI_BOOT_DISK%\efi\boot\r
-@if "%PROCESSOR%"=="IA32" goto CreateBootFileForIA32\r
-@if "%PROCESSOR%"=="X64" goto CreateBootFileForX64\r
-@goto end\r
+@goto CreateBootFile\r
 \r
 :CreateUsb_FAT32\r
 @if "%STEP%"=="2" goto CreateUsb_FAT32_step2\r
@@ -128,20 +122,14 @@ copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com
 \r
 :CreateUsb_FAT32_step2\r
 @copy %BUILD_DIR%\FV\EfiLdr20 %EFI_BOOT_DISK%\r
-@mkdir %EFI_BOOT_DISK%\efi\boot\r
-@if "%PROCESSOR%"=="IA32" goto CreateBootFileForIA32\r
-@if "%PROCESSOR%"=="X64" goto CreateBootFileForX64\r
-@goto end\r
+@goto CreateBootFile\r
 \r
 :CreateIde\r
 @goto end\r
 \r
-:CreateBootFileForIA32\r
-copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\IA32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y\r
-@goto end\r
-\r
-:CreateBootFileForX64\r
-copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\X64\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootx64.efi /y\r
+:CreateBootFile\r
+@mkdir %EFI_BOOT_DISK%\efi\boot\r
+copy %WORKSPACE%\ShellBinPkg\UefiShell\%PROCESSOR%\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot%PROCESSOR%.efi /y\r
 @goto end\r
 \r
 :WrongFATType\r
@@ -155,4 +143,4 @@ copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\X64\Shell.efi %EFI_BOOT_DISK%\efi\b
 :Help\r
 @echo "Usage: CreateBootDisk [usb|floppy|ide] DiskNumber [FAT12|FAT16|FAT32] [IA32|X64]"\r
 :end\r
-@echo on
\ No newline at end of file
+@echo on\r

diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh
index d9574e8f12ac6410fd86a22cc9c8ff75033764bc..f2ff57120a229dd789a517fdb50eb90cff9be907 100755 (executable)
--- a/DuetPkg/CreateBootDisk.sh
+++ b/DuetPkg/CreateBootDisk.sh
@@ -2,7 +2,7 @@
 
 ## @file
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -89,11 +89,11 @@ then
                                mkdir -p $EFI_BOOT_MEDIA/efi/boot
                                if [ "$5" = IA32 ]
                                then
-                                       cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+                                       cp $WORKSPACE/ShellBinPkg/UefiShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/boot$5.efi
                                else
                                        if [ "$5" = X64 ]
                                        then
-                                               cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+                                               cp $WORKSPACE/ShellBinPkg/UefiShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/boot$5.efi
                                        else
                                                echo Wrong Arch!
                                        fi
@@ -115,10 +115,10 @@ then
                                mmd -i $EFI_BOOT_MEDIA ::/efi ::/efi/boot
                                if [ "$5" = IA32 ]
                                then
-                                       mcopy -i $EFI_BOOT_MEDIA $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi ::/efi/boot/bootia32.efi
+                                       mcopy -i $EFI_BOOT_MEDIA $WORKSPACE/ShellBinPkg/UefiShell/Ia32/Shell.efi ::/efi/boot/boot$5.efi
                                elif [ "$5" = X64 ]
                                then
-                                       mcopy -i $EFI_BOOT_MEDIA $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi ::/efi/boot/bootx64.efi
+                                       mcopy -i $EFI_BOOT_MEDIA $WORKSPACE/ShellBinPkg/UefiShell/X64/Shell.efi ::/efi/boot/boot$5.efi
                                else
                                        echo Wrong Arch!
                                fi
@@ -146,11 +146,11 @@ then
                                        mkdir $EFI_BOOT_MEDIA/efi/boot
                                        if [ "$5" = IA32 ]
                                        then
-                                               cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+                                               cp $WORKSPACE/ShellBinPkg/UefiShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/boot$5.efi
                                        else
                                                if [ "$5" = X64 ]
                                                then
-                                                       cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+                                                       cp $WORKSPACE/ShellBinPkg/UefiShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/boot$5.efi
                                                else
                                                        echo Wrong Arch!
                                                fi
@@ -178,11 +178,11 @@ then
                                        mkdir $EFI_BOOT_MEDIA/efi/boot
                                        if [ "$5" = IA32 ]
                                        then
-                                               cp $WORKSPACE/EdkShellBinPkg/MinimumShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootia32.efi 
+                                               cp $WORKSPACE/ShellBinPkg/UefiShell/Ia32/Shell.efi $EFI_BOOT_MEDIA/efi/boot/boot$5.efi
                                        else
                                                if [ "$5" = X64 ]
                                                then
-                                                       cp $WORKSPACE/EdkShellBinPkg/MinimumShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/bootx64.efi 
+                                                       cp $WORKSPACE/ShellBinPkg/UefiShell/X64/Shell.efi $EFI_BOOT_MEDIA/efi/boot/boot$5.efi
                                                else
                                                        echo Wrong Arch!
                                                fi

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 83286b0cb78d8ae0ed5c699a457b0d424d0fd160..2cd96fa2f24994943b38fd31a56d397aeff8e800 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -4,7 +4,7 @@
 # The Emulation Platform can be used to debug individual modules, prior to creating\r
 #    a real platform. This also provides an example for how an DSC is created.\r
 #\r
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -233,6 +233,10 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
 !endif\r
 \r
+!ifndef $(USE_OLD_SHELL)\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
+!endif\r
+\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot\r
   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 8282fcf2f471c6430bc659503e0eb29c75cff666..7174cdf7c07f4a706cb3d8f80334afc437df3d56 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -1,7 +1,7 @@
 ## @file\r
 # This is NT32 FDF file with UEFI HII features enabled\r
 #\r
-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #    This program and the accompanying materials\r
 #    are licensed and made available under the terms and conditions of the BSD License\r
@@ -270,7 +270,11 @@ INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
 # for binary shell, binary fat and logo module.\r
 #\r
 ################################################################################\r
-INF EdkShellBinPkg/FullShell/FullShell.inf\r
+!ifndef $(USE_OLD_SHELL)\r
+INF  ShellBinPkg/UefiShell/UefiShell.inf\r
+!else\r
+INF  EdkShellBinPkg/FullShell/FullShell.inf\r
+!endif\r
 \r
 INF FatBinPkg/EnhancedFatDxe/Fat.inf\r
 \r