From 2790926d8228383c53cf8ede0c8ffba36a91ef90 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Tue, 25 Nov 2014 08:53:33 +0000 Subject: 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 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) (limited to 'DuetPkg/CreateBootDisk.bat') diff --git a/DuetPkg/CreateBootDisk.bat b/DuetPkg/CreateBootDisk.bat index bd611ee..541de81 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 -- cgit v1.1