Vlv2TbltDevicePkg: Fix build failure issue after ECP cleanup
Moved stuff in the three old packages IA32FamilyCpuPkg, Vlv2BinaryPkg and Vlv2MiscBinariesPkg into a new package Vlv2SocBinPkg. Updated the build scripts and added build instructions in Readme.md. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: David Wei <david.wei@intel.com> Cc: Zailiang Sun <zailiang.sun@intel.com> Cc: Yi Qian <yi.qian@intel.com> Cc: Michael Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Zailiang Sun
zwei4
@ -38,7 +38,6 @@
|
||||
[Packages]
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
MdePkg/MdePkg.dec
|
||||
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
ShellPkg/ShellPkg.dec
|
||||
|
||||
@ -15,7 +15,8 @@
|
||||
|
||||
SetLocal EnableDelayedExpansion EnableExtensions
|
||||
|
||||
@REM Go to root directory of the codebase.
|
||||
@REM Go to work space directory.
|
||||
cd ..
|
||||
cd ..
|
||||
|
||||
:: Assign initial values
|
||||
@ -23,8 +24,10 @@ set exitCode=0
|
||||
set "Build_Flags= "
|
||||
set "Stitch_Flags= "
|
||||
set Arch=X64
|
||||
set WORKSPACE=%CD%
|
||||
set CORE_PATH=%WORKSPACE%\edk2
|
||||
set PLATFORM_PATH=%WORKSPACE%\edk2
|
||||
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
|
||||
set ROOT_DIR=%CD%
|
||||
|
||||
:: Parse Optional arguments
|
||||
:OptLoop
|
||||
@ -117,12 +120,9 @@ if "%~3"=="" (
|
||||
:: Build BIOS
|
||||
echo ======================================================================
|
||||
echo Build_IFWI: Calling BIOS build Script...
|
||||
if "%Platform_Type%" == "BYTC" (
|
||||
call %PLATFORM_PACKAGE%\bld_vlv_cr.bat %Build_Flags% %Platform_Type% %Build_Target%
|
||||
|
||||
) else (
|
||||
call %PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
|
||||
)
|
||||
call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
|
||||
|
||||
if %ERRORLEVEL% NEQ 0 (
|
||||
echo echo -- Error Building BIOS & echo.
|
||||
set exitCode=1
|
||||
@ -131,11 +131,11 @@ if %ERRORLEVEL% NEQ 0 (
|
||||
echo.
|
||||
echo Finished Building BIOS.
|
||||
@REM Set BIOS_ID environment variable here.
|
||||
call %WORKSPACE%\Conf\BiosId.bat
|
||||
call %CORE_PATH%\Conf\BiosId.bat
|
||||
echo BIOS_ID=%BIOS_ID%
|
||||
|
||||
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables
|
||||
find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings
|
||||
find /v "#" %CORE_PATH%\Conf\BiosId.env > ver_strings
|
||||
for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
|
||||
del /f/q ver_strings >nul
|
||||
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
|
||||
@ -143,13 +143,10 @@ set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
|
||||
:: Start Integration process
|
||||
echo ======================================================================
|
||||
echo Build_IFWI: Calling IFWI Stitching Script...
|
||||
if "%Platform_Type%" == "BYTC" (
|
||||
pushd %PLATFORM_PACKAGE%\Stitch_CR
|
||||
) else (
|
||||
pushd %PLATFORM_PACKAGE%\Stitch
|
||||
)
|
||||
pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch
|
||||
|
||||
:: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]
|
||||
call IFWIStitch.bat %Stitch_Flags% /B %WORKSPACE%\%BIOS_Name% %IFWI_Suffix%
|
||||
call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%
|
||||
|
||||
@echo off
|
||||
popd
|
||||
@ -188,7 +185,7 @@ set exitCode=1
|
||||
|
||||
:Exit
|
||||
@REM CD to platform package.
|
||||
cd %ROOT_DIR%\Vlv2TbltDevicePkg
|
||||
cd %PLATFORM_PATH%
|
||||
exit /b %exitCode%
|
||||
|
||||
EndLocal
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
|
||||
Vlv2SocBinPkg/Vlv2SocBinPkg.dec
|
||||
|
||||
[LibraryClasses]
|
||||
DebugLib
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
MonoStatusCode.c
|
||||
Vlv2SocBinPkg/Vlv2SocBinPkg.dec
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
MdePkg/MdePkg.dec
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
|
||||
Vlv2SocBinPkg/Vlv2SocBinPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ ENTRY_POINT = PlatformEarlyInitEntry
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
Stall.c
|
||||
Vlv2SocBinPkg/Vlv2SocBinPkg.dec
|
||||
UefiCpuPkg/UefiCpuPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
|
||||
|
||||
@ -71,7 +71,7 @@
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
BootMode.c
|
||||
Vlv2SocBinPkg/Vlv2SocBinPkg.dec
|
||||
UefiCpuPkg/UefiCpuPkg.dec
|
||||
CryptoPkg/CryptoPkg.dec
|
||||
|
||||
|
||||
@ -183,7 +183,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTok
|
||||
|
||||
$(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE)
|
||||
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
|
||||
FILE = Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin
|
||||
FILE = Vlv2SocBinPkg/FspBinary/FvFsp.bin
|
||||
|
||||
|
||||
$(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE)
|
||||
@ -571,7 +571,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
|
||||
INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf
|
||||
FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {
|
||||
SECTION DXE_DEPEX_EXP = {gPlatformGOPPolicyGuid}
|
||||
SECTION PE32 = Vlv2MiscBinariesPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi
|
||||
SECTION PE32 = Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi
|
||||
SECTION UI = "IntelGopDriver"
|
||||
}
|
||||
!endif
|
||||
@ -711,7 +711,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
|
||||
|
||||
!if $(GOP_DRIVER_ENABLE) == TRUE
|
||||
FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
|
||||
SECTION RAW = Vlv2MiscBinariesPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin
|
||||
SECTION RAW = Vlv2SocBinPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin
|
||||
SECTION UI = "IntelGopVbt"
|
||||
}
|
||||
!endif
|
||||
@ -721,7 +721,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
|
||||
#
|
||||
!if $(NETWORK_ENABLE) == TRUE
|
||||
FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {
|
||||
SECTION PE32 = Vlv2MiscBinariesPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
|
||||
SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi
|
||||
SECTION UI = "UNDI"
|
||||
}
|
||||
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#
|
||||
DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg
|
||||
DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg
|
||||
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2BinaryPkg
|
||||
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2SocBinPkg
|
||||
OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE)
|
||||
SUPPORTED_ARCHITECTURES = IA32
|
||||
BUILD_TARGETS = DEBUG|RELEASE
|
||||
@ -1420,7 +1420,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
|
||||
#
|
||||
# CPU/FW Microde
|
||||
#
|
||||
Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf {
|
||||
Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
|
||||
<BuildOptions>
|
||||
*_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#
|
||||
DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg
|
||||
DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg
|
||||
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2BinaryPkg
|
||||
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2SocBinPkg
|
||||
OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE)
|
||||
SUPPORTED_ARCHITECTURES = IA32|X64
|
||||
BUILD_TARGETS = DEBUG|RELEASE
|
||||
@ -1432,7 +1432,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
|
||||
#
|
||||
# CPU/FW Microde
|
||||
#
|
||||
Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf {
|
||||
Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
|
||||
<BuildOptions>
|
||||
*_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
Vlv2TbltDevicePkg/PlatformPkg.dec
|
||||
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h
|
||||
Vlv2SocBinPkg/Vlv2SocBinPkg.dec
|
||||
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
|
||||
|
||||
[LibraryClasses]
|
||||
|
||||
75
Vlv2TbltDevicePkg/Readme.md
Normal file
75
Vlv2TbltDevicePkg/Readme.md
Normal file
@ -0,0 +1,75 @@
|
||||
# **EDK II firmware for Minnowboard Max/Turbot which is based on Intel Valleyview2 SoC (Byatrail platform)**
|
||||
|
||||
----------
|
||||
|
||||
|
||||
## **How to Create a Full Source Tree for Minnowboard Max/Turbot under Windows**
|
||||
### Pre-requisites
|
||||
|
||||
* GIT client: Available from https://git-scm.com/downloads
|
||||
|
||||
### Download Source Code
|
||||
* Create a new directory C:\WORKSPACE as an EDK II work space.
|
||||
|
||||
* GIT clone operations required to pull the EDK II source tree and the edk2-non-osi repository. Run below command in git bash or windows command line.
|
||||
|
||||
- cd C:\WORKSPACE
|
||||
- git clone https://github.com/tianocore/edk2.git
|
||||
- git clone https://github.com/tianocore/edk2-non-osi.git
|
||||
|
||||
Note: The EDK II [Multiple Workspace](https://github.com/tianocore/tianocore.github.io/wiki/Multiple_Workspace)
|
||||
feature is used by this project.
|
||||
|
||||
* Follow the instructions found in the file "OpenSSL-HOWTO.txt" in your work space (e.g. "C:\WORKSPACE\edk2\CryptoPkg\Library\OpensslLib\OpenSSL-HOWTO.txt") to install the Openssl source code.
|
||||
|
||||
## **Windows Build Instructions**
|
||||
|
||||
### Pre-requisites Tools
|
||||
|
||||
* Microsoft Visual Studio.
|
||||
- Visual Studio 2015 recommended and is used in the examples below. Visual Studio 2013 is also supported.
|
||||
|
||||
* WINDDK
|
||||
- Download Microsoft Windows Driver Development Kit 3790.1830 and install it to C:\WINDDK\3790.1830.
|
||||
|
||||
* Python 2.7
|
||||
- Available from http://www.python.org. Install Python to C:\Python27, and add the path "C:\Python27" to system environment variable **PYTHON_HOME**.
|
||||
|
||||
* Install iASL
|
||||
- Install the iasl compiler by downloading iasl-win-20160527.zip from the following
|
||||
location: "https://acpica.org/downloads/" and place the unzipped
|
||||
content ("iasl.exe") into the directory "C:\ASL" on your local hard drive
|
||||
(create the folder "C:\ASL" if it does not exist).
|
||||
|
||||
* Install the NASM* assembly language compiler
|
||||
- Download NASM* 2.12.02 binaries from
|
||||
http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-win64.zip and place the
|
||||
unzipped content ("nasm.exe") into the directory "C:\NASM" on your local hard drive
|
||||
(create the folder "C:\NASM" if it does not exist). Add the path "C:\NASM\" to system environment variable **NASM_PREFIX**.
|
||||
|
||||
* Install Openssl
|
||||
- Download a pre-compiled Openssl Windows binary from
|
||||
https://wiki.openssl.org/index.php/Binaries. Search for a Windows binary in the list
|
||||
of "Third Party OpenSSL Related Binary Distributions". Go to the third party site to
|
||||
download the latest version. Download and extract to C:\Openssl, add the path of openssl.exe
|
||||
("C:\openssl") to system environment variable **OPENSSL_PATH**.
|
||||
|
||||
|
||||
|
||||
### Build Commands
|
||||
* cd C:\WORKSPACE\edk2\Vlv2TbltDevicePkg
|
||||
|
||||
* To build 64-bit release version image: Build_IFWI.bat MNW2 Release
|
||||
|
||||
* To build 64-bit debug version image: Build_IFWI.bat MNW2 Debug
|
||||
|
||||
* To build 32-bit release version image: Build_IFWI.bat /IA32 MNW2 Release
|
||||
|
||||
* To build 32-bit debug version image: Build_IFWI.bat /IA32 MNW2 Debug
|
||||
|
||||
### Output
|
||||
* After the build process successfully completes, the 8MB firmware binary image will
|
||||
be located in the following location on your local hard drive:
|
||||
"C:\WORKSPACE\edk2\Vlv2TbltDevicePkg\Stitch\"
|
||||
|
||||
|
||||
@ -191,7 +191,7 @@ for %%i in (%BIOS_Names%) do (
|
||||
echo Generating IFWI... %BIOS_ID%.bin
|
||||
echo.
|
||||
|
||||
copy /b/y !IFWI_HEADER_FILE! + %WORKSPACE%\Vlv2Binaries\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + %WORKSPACE%\Vlv2Binaries\Vlv2MiscBinariesPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin
|
||||
copy /b/y !IFWI_HEADER_FILE! + ..\..\..\edk2-non-osi\Silicon\Intel\Vlv2SocBinPkg\SEC\!SEC_VERSION!\VLV_SEC_REGION.bin + ..\..\..\edk2-non-osi\Silicon\Intel\Vlv2SocBinPkg\SEC\!SEC_VERSION!\Vacant.bin + !BIOS_Rom! %BIOS_ID%.bin
|
||||
echo.
|
||||
echo ===========================================================================
|
||||
)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@REM @file
|
||||
@REM Windows batch file to build BIOS ROM
|
||||
@REM
|
||||
@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
|
||||
@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
|
||||
@REM This program and the accompanying materials
|
||||
@REM are licensed and made available under the terms and conditions of the BSD License
|
||||
@REM which accompanies this distribution. The full text of the license may be found at
|
||||
@ -17,38 +17,43 @@ echo.
|
||||
echo %date% %time%
|
||||
echo.
|
||||
|
||||
|
||||
::**********************************************************************
|
||||
:: Initial Setup
|
||||
::**********************************************************************
|
||||
REM set WORKSPACE=%CD%
|
||||
REM if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%
|
||||
set WORKSPACE=%CD%
|
||||
if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%
|
||||
set /a build_threads=1
|
||||
set "Build_Flags= "
|
||||
set exitCode=0
|
||||
set Arch=X64
|
||||
set Source=0
|
||||
set CORE_PATH=%WORKSPACE%\edk2
|
||||
set PLATFORM_PATH=%WORKSPACE%\edk2
|
||||
set PACKAGES_PATH=%WORKSPACE%\edk2-non-osi\Silicon\Intel;%WORKSPACE%\edk2
|
||||
cd ./edk2
|
||||
|
||||
:: Clean up previous build files.
|
||||
if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log
|
||||
if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
|
||||
if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log
|
||||
if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt
|
||||
if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt
|
||||
if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt
|
||||
if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db
|
||||
if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
|
||||
if exist %CORE_PATH%\edk2.log del %CORE_PATH%\edk2.log
|
||||
if exist %CORE_PATH%\unitool.log del %CORE_PATH%\unitool.log
|
||||
if exist %CORE_PATH%\Conf\target.txt del %CORE_PATH%\Conf\target.txt
|
||||
if exist %CORE_PATH%\Conf\tools_def.txt del %CORE_PATH%\Conf\tools_def.txt
|
||||
if exist %CORE_PATH%\Conf\build_rule.txt del %CORE_PATH%\Conf\build_rule.txt
|
||||
if exist %CORE_PATH%\Conf\FrameworkDatabase.db del %CORE_PATH%\Conf\FrameworkDatabase.db
|
||||
if exist conf\.cache rmdir /q/s conf\.cache
|
||||
|
||||
:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf
|
||||
:: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding
|
||||
call edksetup.bat > nul
|
||||
call %CORE_PATH%\edksetup.bat Rebuild
|
||||
@echo off
|
||||
|
||||
:: Define platform specific environment variables.
|
||||
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
|
||||
set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
|
||||
set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
|
||||
set PLATFORM_NAME=Vlv2TbltDevicePkg
|
||||
set PLATFORM_PACKAGE=%PLATFORM_PATH%\Vlv2TbltDevicePkg
|
||||
set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
|
||||
set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
|
||||
|
||||
|
||||
REM set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg
|
||||
|
||||
::create new AutoPlatformCFG.txt file
|
||||
copy /y nul %auto_config_inc% >nul
|
||||
@ -62,7 +67,7 @@ copy /y nul %auto_config_inc% >nul
|
||||
if /i "%~1"=="/?" goto Usage
|
||||
|
||||
if /i "%~1"=="/l" (
|
||||
set Build_Flags=%Build_Flags% -j %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log
|
||||
set Build_Flags=%Build_Flags% -j EDK2.log
|
||||
shift
|
||||
goto OptLoop
|
||||
)
|
||||
@ -109,17 +114,17 @@ if "%~1"=="" goto Usage
|
||||
|
||||
::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\
|
||||
if "%Arch%"=="IA32" (
|
||||
findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > %WORKSPACE%\Conf\BiosId.env
|
||||
findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > Conf\BiosId.env
|
||||
echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
|
||||
) else if "%Arch%"=="X64" (
|
||||
findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > %WORKSPACE%\Conf\BiosId.env
|
||||
findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > Conf\BiosId.env
|
||||
echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
|
||||
)
|
||||
|
||||
:: -- Build flags settings for each Platform --
|
||||
echo Setting %1 platform configuration and BIOS ID...
|
||||
if /i "%~1" == "MNW2" (
|
||||
echo BOARD_ID = MNW2MAX >> %WORKSPACE%\Conf\BiosId.env
|
||||
echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env
|
||||
echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
|
||||
|
||||
) else (
|
||||
@ -130,17 +135,17 @@ set Platform_Type=%~1
|
||||
|
||||
if /i "%~2" == "RELEASE" (
|
||||
set target=RELEASE
|
||||
echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env
|
||||
echo BUILD_TYPE = R >> Conf\BiosId.env
|
||||
) else (
|
||||
set target=DEBUG
|
||||
echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env
|
||||
echo BUILD_TYPE = D >> Conf\BiosId.env
|
||||
)
|
||||
|
||||
::**********************************************************************
|
||||
:: Additional EDK Build Setup/Configuration
|
||||
::**********************************************************************
|
||||
echo.
|
||||
echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...
|
||||
echo Setting the Build environment for VS2015/VS2013/VS2012/VS2010/VS2008...
|
||||
if defined VS140COMNTOOLS (
|
||||
if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat"
|
||||
if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" (
|
||||
@ -177,34 +182,34 @@ if defined VS140COMNTOOLS (
|
||||
set TOOL_CHAIN_TAG=VS2008x86
|
||||
)
|
||||
) else (
|
||||
echo --ERROR: VS2008/VS2010/VS2012/VS2013/VS2015 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS/VS140COMMONTOOLS not defined ^^!
|
||||
echo --ERROR: VS2015/VS2013/VS2012/VS2010/VS2008 not installed correctly. VS140COMNTOOLS/VS120COMNTOOLS/VS110COMNTOOLS/VS100COMNTOOLS/VS90COMNTOOLS not defined ^^!
|
||||
echo.
|
||||
goto :BldFail
|
||||
)
|
||||
|
||||
echo Ensuring correct build directory is present for GenBiosId...
|
||||
set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%
|
||||
set BUILD_PATH=Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%
|
||||
|
||||
echo Modifing Conf files for this build...
|
||||
:: Remove lines with these tags from target.txt
|
||||
findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKSPACE%\Conf\target.txt.tmp
|
||||
findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" Conf\target.txt > Conf\target.txt.tmp
|
||||
|
||||
echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo TARGET = %TARGET% >> Conf\target.txt.tmp
|
||||
if "%Arch%"=="IA32" (
|
||||
echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo TARGET_ARCH = IA32 >> Conf\target.txt.tmp
|
||||
) else if "%Arch%"=="X64" (
|
||||
echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo TARGET_ARCH = IA32 X64 >> Conf\target.txt.tmp
|
||||
)
|
||||
echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> Conf\target.txt.tmp
|
||||
echo BUILD_RULE_CONF = Conf/build_rule.txt >> Conf\target.txt.tmp
|
||||
if %Source% == 0 (
|
||||
echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> Conf\target.txt.tmp
|
||||
) else (
|
||||
echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> Conf\target.txt.tmp
|
||||
)
|
||||
echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp
|
||||
echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> Conf\target.txt.tmp
|
||||
|
||||
move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
|
||||
move /Y Conf\target.txt.tmp Conf\target.txt >nul
|
||||
|
||||
::**********************************************************************
|
||||
:: Build BIOS
|
||||
@ -212,11 +217,11 @@ move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
|
||||
|
||||
echo Creating BiosId...
|
||||
pushd %PLATFORM_PACKAGE%
|
||||
if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32
|
||||
GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat
|
||||
if not exist %WORKSPACE%\%BUILD_PATH%\IA32 mkdir %WORKSPACE%\%BUILD_PATH%\IA32
|
||||
GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\IA32\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat
|
||||
if "%Arch%"=="X64" (
|
||||
if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64
|
||||
GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat
|
||||
if not exist %WORKSPACE%\%BUILD_PATH%\X64 mkdir %WORKSPACE%\%BUILD_PATH%\X64
|
||||
GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\X64\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat
|
||||
)
|
||||
popd
|
||||
|
||||
@ -237,24 +242,23 @@ echo Running fce...
|
||||
|
||||
pushd %PLATFORM_PACKAGE%
|
||||
:: Extract Hii data from build and store in HiiDefaultData.txt
|
||||
fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\HiiDefaultData.txt
|
||||
fce read -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd > %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt
|
||||
|
||||
:: save changes to VlvXXX.fd
|
||||
fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV\HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd
|
||||
|
||||
fce update -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd -s %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt -o %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd
|
||||
popd
|
||||
|
||||
if %ERRORLEVEL% NEQ 0 goto BldFail
|
||||
::echo FD successfully updated with default Hii values.
|
||||
|
||||
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables
|
||||
find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings
|
||||
find /v "#" Conf\BiosId.env > ver_strings
|
||||
for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
|
||||
del /f/q ver_strings >nul
|
||||
|
||||
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
|
||||
copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %WORKSPACE%\%BIOS_Name% >nul
|
||||
copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd %BUILD_PATH%\FV\Vlv.ROM >nul
|
||||
copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PATH%\%BIOS_Name% >nul
|
||||
copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %WORKSPACE%\%BUILD_PATH%\FV\Vlv.ROM >nul
|
||||
|
||||
echo.
|
||||
echo Build location: %BUILD_PATH%
|
||||
@ -264,13 +268,13 @@ echo -------------------- The EDKII BIOS build has successfully completed. -----
|
||||
echo.
|
||||
|
||||
@REM build capsule here
|
||||
if "%openssl_path%" == "" (
|
||||
echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated.
|
||||
set exitCode=1
|
||||
goto Exit
|
||||
)
|
||||
echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv
|
||||
build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
|
||||
@REMif "%openssl_path%" == "" (
|
||||
@REM echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated.
|
||||
@REM set exitCode=1
|
||||
@REM goto Exit
|
||||
@REM
|
||||
@REM echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv
|
||||
@REM build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
|
||||
|
||||
goto Exit
|
||||
|
||||
|
||||
Reference in New Issue
Block a user