MdeModulePkg: INF/DEC file updates to EDK II packages

[mirror_edk2.git] / DuetPkg / CreateBootDisk.bat

diff --git a/DuetPkg/CreateBootDisk.bat b/DuetPkg/CreateBootDisk.bat
index ec8483d78551decc2845f13a65068f87aecdfd10..bd611ee00a7ff6ad1e7a66e938c5e4751a056f49 100644 (file)
--- a/DuetPkg/CreateBootDisk.bat
+++ b/DuetPkg/CreateBootDisk.bat
@@ -1,6 +1,6 @@
 @REM ## @file\r
 @REM #\r
-@REM #  Copyright (c) 2010 Intel Corporation. All rights reserved.<BR>\r
+@REM #  Copyright (c) 2010 - 2011, 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
@@ -12,24 +12,30 @@
 @REM #\r
 @REM ##\r
 \r
-@REM Set up environment at fisrt.\r
+@REM Set up environment at first.\r
 \r
 @set BASETOOLS_DIR=%WORKSPACE_TOOLS_PATH%\Bin\Win32\r
-@set BUILD_DIR=%WORKSPACE%\Build\DuetPkg\DEBUG_MYTOOLS\r
 @set BOOTSECTOR_BIN_DIR=%WORKSPACE%\DuetPkg\BootSector\bin\r
 @set DISK_LABEL=DUET\r
 @set PROCESSOR=""\r
+@set STEP=1\r
+@call %WORKSPACE%\DuetPkg\GetVariables.bat\r
 \r
 @echo on\r
 \r
 @if "%1"=="" goto Help\r
 @if "%2"=="" goto Help\r
 @if "%3"=="" goto Help\r
-@if "%4"=="" goto NoArch\r
+@if "%4"=="" goto Set_BootDisk\r
+@if "%4"=="step2" (@set STEP=2) else @set TARGET_ARCH=%4\r
+@if "%5"=="step2" @set STEP=2\r
+:Set_BootDisk\r
 @set EFI_BOOT_DISK=%2\r
-@if "%4"=="IA32" set PROCESSOR=IA32\r
-@if "%4"=="X64" set PROCESSOR=X64\r
+@if "%TARGET_ARCH%"=="IA32" set PROCESSOR=IA32\r
+@if "%TARGET_ARCH%"=="X64" set PROCESSOR=X64\r
 @if %PROCESSOR%=="" goto WrongArch\r
+@set BUILD_DIR=%WORKSPACE%\Build\DuetPkg%PROCESSOR%\%TARGET%_%TOOL_CHAIN_TAG%\r
+\r
 @if "%1"=="floppy" goto CreateFloppy\r
 @if "%1"=="file" goto CreateFile\r
 @if "%1"=="usb" goto CreateUsb\r
@@ -47,9 +53,11 @@ goto Help
 @del FormatCommandInput.txt\r
 @echo Create boot sector ...\r
 %BASETOOLS_DIR%\Genbootsector.exe -i %EFI_BOOT_DISK% -o FDBs.com\r
-%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com %BOOTSECTOR_BIN_DIR%\Bootsect.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 %BOOTSECTOR_BIN_DIR%\Bootsect.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
@@ -62,9 +70,11 @@ mkdir %EFI_BOOT_DISK%\efi\boot
 @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
-%BASETOOLS_DIR%\Bootsectimage.exe -g FDBs.com %BOOTSECTOR_BIN_DIR%\Bootsect.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 %BOOTSECTOR_BIN_DIR%\Bootsect.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
 \r
@@ -75,15 +85,17 @@ mkdir %EFI_BOOT_DISK%\efi\boot
 @if "%3"=="FAT12" goto WrongFATType\r
 \r
 :CreateUsb_FAT16\r
-@if "%5"=="step2" goto CreateUsb_FAT16_step2\r
+@if "%STEP%"=="2" goto CreateUsb_FAT16_step2\r
 @echo Format %EFI_BOOT_DISK% ...\r
 @echo.> FormatCommandInput.txt\r
 @format /FS:FAT /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 UsbBs16.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs16.com %BOOTSECTOR_BIN_DIR%\Bs16.com -f\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bs16.com\r
+@copy %BOOTSECTOR_BIN_DIR%\Bs16.com Bs16-1.com \r
+@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs16.com Bs16-1.com -f \r
+@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs16-1.com\r
+@del Bs16-1.com\r
 @%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
 @echo Done.\r
 @echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
@@ -97,16 +109,18 @@ mkdir %EFI_BOOT_DISK%\efi\boot
 @goto end\r
 \r
 :CreateUsb_FAT32\r
-@if "%5"=="step2" goto CreateUsb_FAT32_step2\r
+@if "%STEP%"=="2" goto CreateUsb_FAT32_step2\r
 @echo Format %EFI_BOOT_DISK% ...\r
 @echo.> FormatCommandInput.txt\r
 @format /FS:FAT32 /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 UsbBs32.com\r
-@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com %BOOTSECTOR_BIN_DIR%\Bs32.com -f\r
+@copy %BOOTSECTOR_BIN_DIR%\Bs32.com Bs32-1.com \r
+@%BASETOOLS_DIR%\Bootsectimage.exe -g UsbBs32.com Bs32-1.com -f \r
 @del UsbBs32.com\r
-@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Bs32.com\r
+@%BASETOOLS_DIR%\Genbootsector.exe -o %EFI_BOOT_DISK% -i Bs32-1.com\r
+@del Bs32-1.com\r
 @%BASETOOLS_DIR%\Genbootsector.exe -m -o %EFI_BOOT_DISK% -i %BOOTSECTOR_BIN_DIR%\Mbr.com\r
 @echo Done.\r
 @echo PLEASE UNPLUG USB, THEN PLUG IT AGAIN!\r
@@ -134,10 +148,6 @@ copy %WORKSPACE%\EdkShellBinPkg\MinimumShell\X64\Shell.efi %EFI_BOOT_DISK%\efi\b
 @echo Wrong FAT type %3 for %1\r
 @goto end\r
 \r
-:NoArch\r
-@echo Error! Please specific the architecture.\r
-@goto Help\r
-\r
 :WrongArch\r
 @echo Error! Wrong architecture.\r
 @goto Help\r