Index: DuetPkg/CreateBootDisk.bat
===================================================================
--- DuetPkg/CreateBootDisk.bat (revision 16379)
+++ DuetPkg/CreateBootDisk.bat (working copy)
@@ -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,18 +52,15 @@
@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
@@ -70,10 +67,10 @@
@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 @@
: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,22 +122,16 @@
: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
+: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
-:CreateBootFileForX64
-copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\X64\Shell.efi %EFI_BOOT_DISK%\efi\boot\bootx64.efi /y
-@goto end
-
:WrongFATType
@echo Wrong FAT type %3 for %1
@goto end
@@ -155,4 +143,4 @@
:Help
@echo "Usage: CreateBootDisk [usb|floppy|ide] DiskNumber [FAT12|FAT16|FAT32] [IA32|X64]"
:end
-@echo on
\ No newline at end of file
+@echo on
Index: DuetPkg/CreateBootDisk.sh
===================================================================
--- DuetPkg/CreateBootDisk.sh (revision 16379)
+++ DuetPkg/CreateBootDisk.sh (working copy)
@@ -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 @@
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 @@
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 @@
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 @@
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
Index: Nt32Pkg/Nt32Pkg.fdf
===================================================================
--- Nt32Pkg/Nt32Pkg.fdf (revision 16396)
+++ Nt32Pkg/Nt32Pkg.fdf (working copy)
@@ -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 @@
# for binary shell, binary fat and logo module.
#
################################################################################
-INF EdkShellBinPkg/FullShell/FullShell.inf
+!ifndef $(USE_OLD_SHELL)
+INF RuleOverride=UEFI_SHELL ShellBinPkg/UefiShell/UefiShell.inf
+!else
+INF EdkShellBinPkg/FullShell/FullShell.inf
+!endif
INF FatBinPkg/EnhancedFatDxe/Fat.inf
@@ -388,8 +392,8 @@
}
}
-[Rule.Common.UEFI_APPLICATION.BINARY]
- FILE APPLICATION = $(NAMED_GUID) {
+[Rule.Common.UEFI_APPLICATION.UEFI_SHELL]
+ FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
COMPRESS PI_STD {
GUIDED {
PE32 PE32 |.efi