From 2790926d8228383c53cf8ede0c8ffba36a91ef90 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Tue, 25 Nov 2014 08:53:33 +0000 Subject: [PATCH] Change NT32 and DUET to use UEFI Shell by default. Use "-D USE_OLD_SHELL" for NT32 to use EDK Shell. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Reviewed-by: Eric Dong git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16444 6f19259b-4bc3-4df7-8a09-765794883524 --- DuetPkg/CreateBootDisk.bat | 42 ++++++++++++++------------------------ DuetPkg/CreateBootDisk.sh | 18 ++++++++-------- Nt32Pkg/Nt32Pkg.dsc | 6 +++++- Nt32Pkg/Nt32Pkg.fdf | 8 ++++++-- 4 files changed, 35 insertions(+), 39 deletions(-) diff --git a/DuetPkg/CreateBootDisk.bat b/DuetPkg/CreateBootDisk.bat index bd611ee00a..541de816f2 100644 --- a/DuetPkg/CreateBootDisk.bat +++ b/DuetPkg/CreateBootDisk.bat @@ -1,6 +1,6 @@ @REM ## @file @REM # -@REM # Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+@REM # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
@REM # @REM # This program and the accompanying materials @REM # are licensed and made available under the terms and conditions of the BSD License @@ -52,28 +52,25 @@ goto Help @format /v:%DISK_LABEL% /q %EFI_BOOT_DISK% < FormatCommandInput.txt > NUL @del FormatCommandInput.txt @echo Create boot sector ... -%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com +@%BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com @copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com -%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f +@%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f @REM @del FDBS.com -%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com +@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com @del FDBs-1.com @echo Done. -copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK% -mkdir %EFI_BOOT_DISK%\efi\boot -@if "%PROCESSOR%"=="IA32" goto CreateBootFileForIA32 -@if "%PROCESSOR%"=="X64" goto CreateBootFileForX64 -@goto end +@copy %BUILD_DIR%\FV\EfiLdr %EFI_BOOT_DISK% +@goto CreateBootFile :CreateFile @if NOT "%3"=="FAT12" goto WrongFATType @echo Start to create file boot disk ... @echo Create boot sector ... %BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com -copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com -%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f +@copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com +@%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com FDBs-1.com -f @REM @del FDBS.com -%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com +@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i FDBs-1.com @del FDBs-1.com @echo Done. @goto end @@ -103,10 +100,7 @@ copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com :CreateUsb_FAT16_step2 @copy %BUILD_DIR%\FV\EfiLdr16 %EFI_BOOT_DISK% -@mkdir %EFI_BOOT_DISK%\efi\boot -@if "%PROCESSOR%"=="IA32" goto CreateBootFileForIA32 -@if "%PROCESSOR%"=="X64" goto CreateBootFileForX64 -@goto end +@goto CreateBootFile :CreateUsb_FAT32 @if "%STEP%"=="2" goto CreateUsb_FAT32_step2 @@ -128,20 +122,14 @@ copy %BOOTSECTOR_BIN_DIR%\Bootsect.com FDBs-1.com :CreateUsb_FAT32_step2 @copy %BUILD_DIR%\FV\EfiLdr20 %EFI_BOOT_DISK% -@mkdir %EFI_BOOT_DISK%\efi\boot -@if "%PROCESSOR%"=="IA32" goto CreateBootFileForIA32 -@if "%PROCESSOR%"=="X64" goto CreateBootFileForX64 -@goto end +@goto CreateBootFile :CreateIde @goto end -:CreateBootFileForIA32 -copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\IA32\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootia32.efi /y -@goto end - -:CreateBootFileForX64 -copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\X64\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootx64.efi /y +:CreateBootFile +@mkdir %EFI_BOOT_DISK%\efi\boot +copy %WORKSPACE%\ShellBinPkg\UefiShell\%PROCESSOR%\Shell.efi %EFI_BOOT_DISK%\efi\boot\boot%PROCESSOR%.efi /y @goto end :WrongFATType @@ -155,4 +143,4 @@ copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\X64\Shell.efi %EFI_BOOT_DISK%\efi\b :Help @echo "Usage: CreateBootDisk [usb|floppy|ide] DiskNumber [FAT12|FAT16|FAT32] [IA32|X64]" :end -@echo on \ No newline at end of file +@echo on diff --git a/DuetPkg/CreateBootDisk.sh b/DuetPkg/CreateBootDisk.sh index d9574e8f12..f2ff57120a 100755 --- a/DuetPkg/CreateBootDisk.sh +++ b/DuetPkg/CreateBootDisk.sh @@ -2,7 +2,7 @@ ## @file # -# Copyright (c) 2010, Intel Corporation. All rights reserved.
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
# # 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 83286b0cb7..2cd96fa2f2 100644 --- 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 # a real platform. This also provides an example for how an DSC is created. # -# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -233,6 +233,10 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 !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 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04 diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index 8282fcf2f4..7174cdf7c0 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -1,7 +1,7 @@ ## @file # This is NT32 FDF file with UEFI HII features enabled # -# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -270,7 +270,11 @@ INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf # for binary shell, binary fat and logo module. # ################################################################################ -INF EdkShellBinPkg/FullShell/FullShell.inf +!ifndef $(USE_OLD_SHELL) +INF ShellBinPkg/UefiShell/UefiShell.inf +!else +INF EdkShellBinPkg/FullShell/FullShell.inf +!endif INF FatBinPkg/EnhancedFatDxe/Fat.inf -- 2.39.2