@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
@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 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%\DEBUG_MYTOOLS\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 "%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
@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
@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