tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2019-02-28 11:12:42 +08:00 committed by zwei4
parent a4712bea79
commit 46002a4a37
14 changed files with 727 additions and 652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
View File

@ -1,90 +1,89 @@
## @file ## @file
# Implements a Tunnel Mountain specific flash update program. This will allow # Implements a Tunnel Mountain specific flash update program. This will allow
# users to update all regions of the flash as needed in a given update. # users to update all regions of the flash as needed in a given update.
# #
# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #
# #
## ##
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = FirmwareUpdate BASE_NAME = FirmwareUpdate
FILE_GUID = AEFAF26C-FB6D-4fef-AF7A-9D78FF201FCA FILE_GUID = AEFAF26C-FB6D-4fef-AF7A-9D78FF201FCA
MODULE_TYPE = UEFI_APPLICATION MODULE_TYPE = UEFI_APPLICATION
VERSION_STRING = 1.0 VERSION_STRING = 1.0
ENTRY_POINT = ShellCEntryLib ENTRY_POINT = ShellCEntryLib
# #
# The following information is for reference only and not required by the build tools. # The following information is for reference only and not required by the build tools.
# #
# VALID_ARCHITECTURES = X64 # VALID_ARCHITECTURES = X64
# #
[Sources] [Sources]
FirmwareUpdateStrings.uni FirmwareUpdateStrings.uni
FirmwareUpdate.c FirmwareUpdate.c
FirmwareUpdate.h FirmwareUpdate.h
[Packages] [Packages]
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec ShellPkg/ShellPkg.dec
ShellPkg/ShellPkg.dec
[LibraryClasses]
[LibraryClasses] BaseLib
BaseLib BaseMemoryLib
BaseMemoryLib CacheMaintenanceLib
CacheMaintenanceLib DebugLib
DebugLib FileHandleLib
FileHandleLib #FlashDeviceLib
#FlashDeviceLib #SpiFlashCommonLib
#SpiFlashCommonLib MemoryAllocationLib
MemoryAllocationLib PcdLib
PcdLib ShellCEntryLib
ShellCEntryLib ShellLib
ShellLib UefiApplicationEntryPoint
UefiApplicationEntryPoint UefiBootServicesTableLib
UefiBootServicesTableLib UefiLib
UefiLib UefiRuntimeServicesTableLib
UefiRuntimeServicesTableLib
[Protocols]
[Protocols] gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_CONSUMED gEfiSpiProtocolGuid
gEfiSpiProtocolGuid
[Pcd]
[Pcd] gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize ## CONSUMES
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize ## CONSUMES
[FixedPcd]
[FixedPcd] # gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize # gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase # gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize # gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase # gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize # gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
gPlatformModuleTokenSpaceGuid.PcdFlashChipBase
gPlatformModuleTokenSpaceGuid.PcdFlashChipBase gPlatformModuleTokenSpaceGuid.PcdFlashChipSize
gPlatformModuleTokenSpaceGuid.PcdFlashChipSize gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase
gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize
gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize gPlatformModuleTokenSpaceGuid.PcdTxeRomBase
gPlatformModuleTokenSpaceGuid.PcdTxeRomBase gPlatformModuleTokenSpaceGuid.PcdTxeRomSize
gPlatformModuleTokenSpaceGuid.PcdTxeRomSize gPlatformModuleTokenSpaceGuid.PcdBiosRomBase
gPlatformModuleTokenSpaceGuid.PcdBiosRomBase gPlatformModuleTokenSpaceGuid.PcdBiosRomSize
gPlatformModuleTokenSpaceGuid.PcdBiosRomSize
[BuildOptions]
[BuildOptions] MSFT:*_*_X64_CC_FLAGS = /Od
MSFT:*_*_X64_CC_FLAGS = /Od
INTEL:*_*_X64_CC_FLAGS = /Od INTEL:*_*_X64_CC_FLAGS = /Od

35
Vlv2TbltDevicePkg/Build_IFWI.bat
View File

@ -15,7 +15,8 @@
SetLocal EnableDelayedExpansion EnableExtensions SetLocal EnableDelayedExpansion EnableExtensions
@REM Go to root directory of the codebase. @REM Go to work space directory.
cd ..
cd .. cd ..
:: Assign initial values :: Assign initial values
@ -23,8 +24,10 @@ set exitCode=0
set "Build_Flags= " set "Build_Flags= "
set "Stitch_Flags= " set "Stitch_Flags= "
set Arch=X64 set Arch=X64
set WORKSPACE=%CD%
set CORE_PATH=%WORKSPACE%\edk2
set PLATFORM_PATH=%WORKSPACE%\edk2
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg set PLATFORM_PACKAGE=Vlv2TbltDevicePkg
set ROOT_DIR=%CD%
:: Parse Optional arguments :: Parse Optional arguments
:OptLoop :OptLoop
@ -117,12 +120,9 @@ if "%~3"=="" (
:: Build BIOS :: Build BIOS
echo ====================================================================== echo ======================================================================
echo Build_IFWI: Calling BIOS build Script... echo Build_IFWI: Calling BIOS build Script...
if "%Platform_Type%" == "BYTC" (
call %PLATFORM_PACKAGE%\bld_vlv_cr.bat %Build_Flags% %Platform_Type% %Build_Target% call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
) else (
call %PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags% %Platform_Type% %Build_Target%
)
if %ERRORLEVEL% NEQ 0 ( if %ERRORLEVEL% NEQ 0 (
echo echo -- Error Building BIOS & echo. echo echo -- Error Building BIOS & echo.
set exitCode=1 set exitCode=1
@ -131,11 +131,11 @@ if %ERRORLEVEL% NEQ 0 (
echo. echo.
echo Finished Building BIOS. echo Finished Building BIOS.
@REM Set BIOS_ID environment variable here. @REM Set BIOS_ID environment variable here.
call %WORKSPACE%\Conf\BiosId.bat call %CORE_PATH%\Conf\BiosId.bat
echo BIOS_ID=%BIOS_ID% echo BIOS_ID=%BIOS_ID%
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables :: 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 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
del /f/q ver_strings >nul del /f/q ver_strings >nul
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
@ -143,15 +143,12 @@ set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
:: Start Integration process :: Start Integration process
echo ====================================================================== echo ======================================================================
echo Build_IFWI: Calling IFWI Stitching Script... echo Build_IFWI: Calling IFWI Stitching Script...
if "%Platform_Type%" == "BYTC" ( pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch
pushd %PLATFORM_PACKAGE%\Stitch_CR
) else ( :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]
pushd %PLATFORM_PACKAGE%\Stitch call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%
)
:: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]
call IFWIStitch.bat %Stitch_Flags% /B %WORKSPACE%\%BIOS_Name% %IFWI_Suffix%
@echo off @echo off
popd popd
if %ERRORLEVEL% NEQ 0 ( if %ERRORLEVEL% NEQ 0 (
echo echo -- Error Stitching %BIOS_Nam% & echo. echo echo -- Error Stitching %BIOS_Nam% & echo.
@ -188,7 +185,7 @@ set exitCode=1
:Exit :Exit
@REM CD to platform package. @REM CD to platform package.
cd %ROOT_DIR%\Vlv2TbltDevicePkg cd %PLATFORM_PATH%
exit /b %exitCode% exit /b %exitCode%
EndLocal EndLocal

166
Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
View File

@ -1,83 +1,83 @@
# #
# #
# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved # Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #
# #
# #
# Module Name: # Module Name:
# #
# MultiPlatform.inf # MultiPlatform.inf
# #
# Abstract: # Abstract:
# #
# #
--*/ --*/
[defines] [defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = MultiPlatformLib BASE_NAME = MultiPlatformLib
FILE_GUID = AB83A52B-B44A-462c-B099-444CC0ED274D FILE_GUID = AB83A52B-B44A-462c-B099-444CC0ED274D
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = MultiPlatformLib LIBRARY_CLASS = MultiPlatformLib
PI_SPECIFICATION_VERSION = 0x0001000A PI_SPECIFICATION_VERSION = 0x0001000A
[sources] [sources]
MultiPlatformLib.c MultiPlatformLib.c
MultiPlatformLib.h MultiPlatformLib.h
PlatformInfoHob.c PlatformInfoHob.c
#GPIO #GPIO
BoardGpios/BoardGpios.c BoardGpios/BoardGpios.c
BoardGpios/BoardGpios.h BoardGpios/BoardGpios.h
#ClkGen #ClkGen
BoardClkGens/BoardClkGens.c BoardClkGens/BoardClkGens.c
BoardClkGens/BoardClkGens.h BoardClkGens/BoardClkGens.h
#Jumper #Jumper
BoardJumpers/BoardJumpers.c BoardJumpers/BoardJumpers.c
BoardJumpers/BoardJumpers.h BoardJumpers/BoardJumpers.h
#OemId #OemId
BoardOemIds/BoardOemIds.c BoardOemIds/BoardOemIds.c
BoardOemIds/BoardOemIds.h BoardOemIds/BoardOemIds.h
#SSIDSVID #SSIDSVID
BoardSsidSvid/BoardSsidSvid.c BoardSsidSvid/BoardSsidSvid.c
BoardSsidSvid/BoardSsidSvid.h BoardSsidSvid/BoardSsidSvid.h
[Guids] [Guids]
gEfiPlatformInfoGuid # ALWAYS_CONSUMED gEfiPlatformInfoGuid # ALWAYS_CONSUMED
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec Vlv2SocBinPkg/Vlv2SocBinPkg.dec
[LibraryClasses] [LibraryClasses]
DebugLib DebugLib
HobLib HobLib
IoLib IoLib
# PeiKscLib # PeiKscLib
[Ppis] [Ppis]
gEfiPeiReadOnlyVariable2PpiGuid gEfiPeiReadOnlyVariable2PpiGuid
[Pcd.common] [Pcd.common]
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
[Guids] [Guids]
gEfiSetupVariableGuid gEfiSetupVariableGuid

156
Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
View File

@ -1,78 +1,78 @@
# #
# #
# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved # Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #
# Module Name: # Module Name:
# #
# MonoStatusCode.inf # MonoStatusCode.inf
# #
# Abstract: # Abstract:
# #
# Component description file for Status Code PEI module # Component description file for Status Code PEI module
# #
#--*/ #--*/
[defines] [defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = MonoStatusCode BASE_NAME = MonoStatusCode
FILE_GUID = 4BB346D2-8076-4671-8BC9-7B95CBB9A6DF FILE_GUID = 4BB346D2-8076-4671-8BC9-7B95CBB9A6DF
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 1.0 VERSION_STRING = 1.0
# ENTRY_POINT = InstallMonoStatusCode # ENTRY_POINT = InstallMonoStatusCode
LIBRARY_CLASS = MonoStatusCodeLib LIBRARY_CLASS = MonoStatusCodeLib
[sources.common] [sources.common]
MonoStatusCode.c MonoStatusCode.c
MonoStatusCode.h MonoStatusCode.h
PlatformStatusCode.c PlatformStatusCode.c
PlatformStatusCode.h PlatformStatusCode.h
PeiPostCode.c PeiPostCode.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec Vlv2SocBinPkg/Vlv2SocBinPkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec
[LibraryClasses] [LibraryClasses]
PeimEntryPoint PeimEntryPoint
HobLib HobLib
DebugLib DebugLib
SerialPortLib SerialPortLib
ReportStatusCodeLib ReportStatusCodeLib
PrintLib PrintLib
BaseMemoryLib BaseMemoryLib
PchPlatformLib PchPlatformLib
[Ppis] [Ppis]
gEfiPeiMemoryDiscoveredPpiGuid gEfiPeiMemoryDiscoveredPpiGuid
gEfiPeiStatusCodePpiGuid gEfiPeiStatusCodePpiGuid
gEfiPeiFvFileLoaderPpiGuid gEfiPeiFvFileLoaderPpiGuid
[Protocols] [Protocols]
gEfiStatusCodeRuntimeProtocolGuid gEfiStatusCodeRuntimeProtocolGuid
[Pcd] [Pcd]
gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam
[Guids] [Guids]
gEfiPlatformCpuInfoGuid gEfiPlatformCpuInfoGuid
gEfiHtBistHobGuid gEfiHtBistHobGuid
gEfiStatusCodeDataTypeStringGuid ## CONSUMES gEfiStatusCodeDataTypeStringGuid ## CONSUMES
[Depex] [Depex]
TRUE TRUE

122
Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
View File

@ -1,61 +1,61 @@
#/*++ #/*++
# #
# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved # Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #
# Module Name: # Module Name:
# #
# PlatformCpuInfoDxe.inf # PlatformCpuInfoDxe.inf
# #
# Abstract: # Abstract:
# #
# #
--*/ --*/
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = PlatformCpuInfoDxe BASE_NAME = PlatformCpuInfoDxe
FILE_GUID = 025F738B-4EBD-4d55-B728-5F421B601F20 FILE_GUID = 025F738B-4EBD-4d55-B728-5F421B601F20
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
ENTRY_POINT = PlatformCpuInfoInit ENTRY_POINT = PlatformCpuInfoInit
[Sources] [Sources]
PlatformCpuInfoDxe.c PlatformCpuInfoDxe.c
PlatformCpuInfoDxe.h PlatformCpuInfoDxe.h
[Guids] [Guids]
gEfiPlatformCpuInfoGuid gEfiPlatformCpuInfoGuid
gEfiVlv2VariableGuid gEfiVlv2VariableGuid
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h Vlv2SocBinPkg/Vlv2SocBinPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses] [LibraryClasses]
HobLib HobLib
UefiRuntimeServicesTableLib UefiRuntimeServicesTableLib
UefiDriverEntryPoint UefiDriverEntryPoint
[BuildOptions] [BuildOptions]
MSFT:*_*_*_CC_FLAGS = /Od /GL- MSFT:*_*_*_CC_FLAGS = /Od /GL-
INTEL:*_*_*_CC_FLAGS = /Od /GL- INTEL:*_*_*_CC_FLAGS = /Od /GL-
[Depex] [Depex]
gEfiVariableArchProtocolGuid AND gEfiVariableArchProtocolGuid AND
gEfiVariableWriteArchProtocolGuid gEfiVariableWriteArchProtocolGuid

246
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
View File

@ -1,123 +1,123 @@
# #
# #
# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved # Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #
# #
# Module Name: # Module Name:
# #
# PlatformEarlyInit.inf # PlatformEarlyInit.inf
# #
# Abstract: # Abstract:
# #
# Component description file for PlatformEarlyInit module # Component description file for PlatformEarlyInit module
# #
#--*/ #--*/
[defines] [defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = PlatformEarlyInit BASE_NAME = PlatformEarlyInit
FILE_GUID = 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0 FILE_GUID = 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 1.0 VERSION_STRING = 1.0
PI_SPECIFICATION_VERSION = 0x0001000A PI_SPECIFICATION_VERSION = 0x0001000A
ENTRY_POINT = PlatformEarlyInitEntry ENTRY_POINT = PlatformEarlyInitEntry
[sources.common] [sources.common]
BootMode.c BootMode.c
CpuInitPeim.c CpuInitPeim.c
PchInitPeim.c PchInitPeim.c
MchInit.c MchInit.c
MemoryCallback.c MemoryCallback.c
MemoryPeim.c MemoryPeim.c
PlatformEarlyInit.c PlatformEarlyInit.c
PlatformEarlyInit.h PlatformEarlyInit.h
PlatformInfoInit.c PlatformInfoInit.c
LegacySpeaker.c LegacySpeaker.c
LegacySpeaker.h LegacySpeaker.h
Stall.c Stall.c
PlatformSsaInitPeim.c PlatformSsaInitPeim.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec Vlv2SocBinPkg/Vlv2SocBinPkg.dec
UefiCpuPkg/UefiCpuPkg.dec UefiCpuPkg/UefiCpuPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses] [LibraryClasses]
PeimEntryPoint PeimEntryPoint
DebugLib DebugLib
HobLib HobLib
IoLib IoLib
# PeiKscLib # PeiKscLib
MultiPlatformLib MultiPlatformLib
PcdLib PcdLib
PchPlatformLib PchPlatformLib
MtrrLib MtrrLib
[Ppis] [Ppis]
gEfiPeiStallPpiGuid gEfiPeiStallPpiGuid
gPeiSpeakerInterfacePpiGuid gPeiSpeakerInterfacePpiGuid
gEfiPeiMemoryDiscoveredPpiGuid gEfiPeiMemoryDiscoveredPpiGuid
gVlvPolicyPpiGuid gVlvPolicyPpiGuid
gEfiPeiReadOnlyVariable2PpiGuid gEfiPeiReadOnlyVariable2PpiGuid
gEfiPeiResetPpiGuid gEfiPeiResetPpiGuid
gEfiEndOfPeiSignalPpiGuid gEfiEndOfPeiSignalPpiGuid
gPeiSmbusPolicyPpiGuid gPeiSmbusPolicyPpiGuid
gEfiFindFvPpiGuid gEfiFindFvPpiGuid
gPeiCapsulePpiGuid gPeiCapsulePpiGuid
gEfiPeiBootInRecoveryModePpiGuid gEfiPeiBootInRecoveryModePpiGuid
gEfiPeiRecoveryModulePpiGuid gEfiPeiRecoveryModulePpiGuid
gEfiPeiDeviceRecoveryModulePpiGuid gEfiPeiDeviceRecoveryModulePpiGuid
gPeiCachePpiGuid gPeiCachePpiGuid
gEfiPeiMasterBootModePpiGuid gEfiPeiMasterBootModePpiGuid
gEfiPeiSmbusPpiGuid gEfiPeiSmbusPpiGuid
gPchInitPpiGuid gPchInitPpiGuid
gPchUsbPolicyPpiGuid gPchUsbPolicyPpiGuid
[Guids] [Guids]
gEfiSetupVariableGuid gEfiSetupVariableGuid
gEfiPlatformInfoGuid gEfiPlatformInfoGuid
gEfiPlatformBootModeGuid gEfiPlatformBootModeGuid
gEfiPlatformCpuInfoGuid gEfiPlatformCpuInfoGuid
gEfiGlobalVariableGuid gEfiGlobalVariableGuid
gRecoveryOnFatFloppyDiskGuid gRecoveryOnFatFloppyDiskGuid
gRecoveryOnFatUsbDiskGuid gRecoveryOnFatUsbDiskGuid
gRecoveryOnFatIdeDiskGuid gRecoveryOnFatIdeDiskGuid
gRecoveryOnDataCdGuid gRecoveryOnDataCdGuid
gMfgModeVariableGuid gMfgModeVariableGuid
gEfiNormalSetupGuid gEfiNormalSetupGuid
gEfiMemoryTypeInformationGuid gEfiMemoryTypeInformationGuid
gOsSelectionVariableGuid gOsSelectionVariableGuid
gEfiSmmPeiSmramMemoryReserveGuid gEfiSmmPeiSmramMemoryReserveGuid
[Pcd.common] [Pcd.common]
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress
gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
[Pcd] [Pcd]
gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState
[Depex] [Depex]
gEfiPeiReadOnlyVariable2PpiGuid AND gPeiCachePpiGuid gEfiPeiReadOnlyVariable2PpiGuid AND gPeiCachePpiGuid

270
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
View File

@ -1,135 +1,135 @@
# #
# #
# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved # Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution. # the terms and conditions of the BSD License that accompanies this distribution.
# The full text of the license may be found at # The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# #
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #
# This PEIM includes 3 parts, pre memory initialization, MRC # This PEIM includes 3 parts, pre memory initialization, MRC
# wrapper and post memory initialization. # wrapper and post memory initialization.
# On pre memory, following action is performed, # On pre memory, following action is performed,
# 1. Initizluize GMCH. # 1. Initizluize GMCH.
# 2. Detect boot mode. # 2. Detect boot mode.
# 3. Detect video adapter to determine whether we need pre allocated # 3. Detect video adapter to determine whether we need pre allocated
# memory. # memory.
# #
# After that MRC wrapper calls MRC to initialize memory and install a PPI # After that MRC wrapper calls MRC to initialize memory and install a PPI
# notify to do post memory # notify to do post memory
# initialization. MRC wrapper performance following actions, # initialization. MRC wrapper performance following actions,
# 1. Install EFI Memory. # 1. Install EFI Memory.
# 2. Capsule coalesce if capsule boot mode. # 2. Capsule coalesce if capsule boot mode.
# 3. Create HOB of system memory. # 3. Create HOB of system memory.
# Note: MRC supports 3 kinds of chipsets including Lakeport, Glenwood and Mukilteo, # Note: MRC supports 3 kinds of chipsets including Lakeport, Glenwood and Mukilteo,
# so please don't define MACRO MUKILTEO_SUPPORT on Lakeport here. # so please don't define MACRO MUKILTEO_SUPPORT on Lakeport here.
# #
# On post memory, following action is performed, # On post memory, following action is performed,
# 1. TC initialization after MRC. # 1. TC initialization after MRC.
# 2. SIO initialization. # 2. SIO initialization.
# 3. Install ResetSystem and FinvFv PPI, relocate Stall to memory on # 3. Install ResetSystem and FinvFv PPI, relocate Stall to memory on
# recovery boot mode. # recovery boot mode.
# 4. Set MTRR for PEI # 4. Set MTRR for PEI
# 5. Create FV HOB and Flash HOB # 5. Create FV HOB and Flash HOB
# 6. Install RecoveryModule and AtaController PPI if on recovery boot mode. # 6. Install RecoveryModule and AtaController PPI if on recovery boot mode.
# #
# This PEIM does not have any register access directly, it depends on # This PEIM does not have any register access directly, it depends on
# IntelTCLib, TCAccess libraries to access Chipset # IntelTCLib, TCAccess libraries to access Chipset
# registers. # registers.
# #
# Platform.c - Provide main flow and entrypoint of PEIM. # Platform.c - Provide main flow and entrypoint of PEIM.
# MemoryCallback.c - Includes a memory call back function notified when # MemoryCallback.c - Includes a memory call back function notified when
# MRC is done. # MRC is done.
# #
# #
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = PlatformPeim BASE_NAME = PlatformPeim
FILE_GUID = 9618C0DC-50A4-496c-994F-7241F282ED01 FILE_GUID = 9618C0DC-50A4-496c-994F-7241F282ED01
MODULE_TYPE = PEIM MODULE_TYPE = PEIM
VERSION_STRING = 1.0 VERSION_STRING = 1.0
ENTRY_POINT = PeiInitPlatform ENTRY_POINT = PeiInitPlatform
PI_SPECIFICATION_VERSION = 0x0001000A PI_SPECIFICATION_VERSION = 0x0001000A
[sources.common] [sources.common]
Platform.c Platform.c
Platform.h Platform.h
MemoryCallback.c MemoryCallback.c
CommonHeader.h CommonHeader.h
Stall.c Stall.c
BootMode.c BootMode.c
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec MdeModulePkg/MdeModulePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec Vlv2SocBinPkg/Vlv2SocBinPkg.dec
UefiCpuPkg/UefiCpuPkg.dec UefiCpuPkg/UefiCpuPkg.dec
CryptoPkg/CryptoPkg.dec CryptoPkg/CryptoPkg.dec
[LibraryClasses] [LibraryClasses]
PeimEntryPoint PeimEntryPoint
DebugLib DebugLib
HobLib HobLib
IoLib IoLib
MultiPlatformLib MultiPlatformLib
MtrrLib MtrrLib
PerformanceLib PerformanceLib
MonoStatusCodeLib MonoStatusCodeLib
BaseCryptLib BaseCryptLib
PciLib PciLib
[Ppis] [Ppis]
gEfiPeiStallPpiGuid gEfiPeiStallPpiGuid
gPeiSpeakerInterfacePpiGuid gPeiSpeakerInterfacePpiGuid
gEfiPeiMemoryDiscoveredPpiGuid gEfiPeiMemoryDiscoveredPpiGuid
gVlvPolicyPpiGuid gVlvPolicyPpiGuid
gEfiPeiReadOnlyVariable2PpiGuid gEfiPeiReadOnlyVariable2PpiGuid
gEfiPeiResetPpiGuid gEfiPeiResetPpiGuid
gEfiEndOfPeiSignalPpiGuid gEfiEndOfPeiSignalPpiGuid
gEfiFindFvPpiGuid gEfiFindFvPpiGuid
gPeiCapsulePpiGuid gPeiCapsulePpiGuid
gEfiPeiBootInRecoveryModePpiGuid gEfiPeiBootInRecoveryModePpiGuid
gEfiPeiRecoveryModulePpiGuid gEfiPeiRecoveryModulePpiGuid
gEfiPeiDeviceRecoveryModulePpiGuid gEfiPeiDeviceRecoveryModulePpiGuid
gPeiCachePpiGuid gPeiCachePpiGuid
gEfiPeiMasterBootModePpiGuid gEfiPeiMasterBootModePpiGuid
gEfiPeiSmbusPpiGuid gEfiPeiSmbusPpiGuid
gPeiMfgMemoryTestPpiGuid gPeiMfgMemoryTestPpiGuid
gPeiSha256HashPpiGuid gPeiSha256HashPpiGuid
gVlvMmioPolicyPpiGuid gVlvMmioPolicyPpiGuid
gSeCfTPMPolicyPpiGuid gSeCfTPMPolicyPpiGuid
[Guids] [Guids]
gEfiSetupVariableGuid gEfiSetupVariableGuid
gEfiPlatformInfoGuid gEfiPlatformInfoGuid
gEfiPlatformBootModeGuid gEfiPlatformBootModeGuid
gEfiPlatformCpuInfoGuid gEfiPlatformCpuInfoGuid
gEfiGlobalVariableGuid gEfiGlobalVariableGuid
gRecoveryOnFatFloppyDiskGuid gRecoveryOnFatFloppyDiskGuid
gRecoveryOnFatUsbDiskGuid gRecoveryOnFatUsbDiskGuid
gRecoveryOnFatIdeDiskGuid gRecoveryOnFatIdeDiskGuid
gRecoveryOnDataCdGuid gRecoveryOnDataCdGuid
gMfgModeVariableGuid gMfgModeVariableGuid
gEfiNormalSetupGuid gEfiNormalSetupGuid
gEfiVlv2VariableGuid gEfiVlv2VariableGuid
[Pcd.common] [Pcd.common]
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
[Depex] [Depex]
TRUE TRUE

8
Vlv2TbltDevicePkg/PlatformPkg.fdf
View File

@ -183,7 +183,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTok
$(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE) $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE)
gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize
FILE = Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin FILE = Vlv2SocBinPkg/FspBinary/FvFsp.bin
$(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE) $(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE)
@ -571,7 +571,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf
FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 { FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {
SECTION DXE_DEPEX_EXP = {gPlatformGOPPolicyGuid} 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" SECTION UI = "IntelGopDriver"
} }
!endif !endif
@ -711,7 +711,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
!if $(GOP_DRIVER_ENABLE) == TRUE !if $(GOP_DRIVER_ENABLE) == TRUE
FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA { 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" SECTION UI = "IntelGopVbt"
} }
!endif !endif
@ -721,7 +721,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
# #
!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_ENABLE) == TRUE
FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C { 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" SECTION UI = "UNDI"
} }
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

4
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
View File

@ -32,7 +32,7 @@
# #
DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg
DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2BinaryPkg DEFINE PLATFORM_BINARY_PACKAGE = Vlv2SocBinPkg
OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE) OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE)
SUPPORTED_ARCHITECTURES = IA32 SUPPORTED_ARCHITECTURES = IA32
BUILD_TARGETS = DEBUG|RELEASE BUILD_TARGETS = DEBUG|RELEASE
@ -1420,7 +1420,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
# #
# CPU/FW Microde # CPU/FW Microde
# #
Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf { Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
<BuildOptions> <BuildOptions>
*_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
} }

4
Vlv2TbltDevicePkg/PlatformPkgX64.dsc
View File

@ -32,7 +32,7 @@
# #
DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg DEFINE PLATFORM_PACKAGE = Vlv2TbltDevicePkg
DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg DEFINE PLATFORM_RC_PACKAGE = Vlv2DeviceRefCodePkg
DEFINE PLATFORM_BINARY_PACKAGE = Vlv2BinaryPkg DEFINE PLATFORM_BINARY_PACKAGE = Vlv2SocBinPkg
OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE) OUTPUT_DIRECTORY = Build/$(PLATFORM_PACKAGE)
SUPPORTED_ARCHITECTURES = IA32|X64 SUPPORTED_ARCHITECTURES = IA32|X64
BUILD_TARGETS = DEBUG|RELEASE BUILD_TARGETS = DEBUG|RELEASE
@ -1432,7 +1432,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
# #
# CPU/FW Microde # CPU/FW Microde
# #
Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf { Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {
<BuildOptions> <BuildOptions>
*_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF
} }

2
Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
View File

@ -35,7 +35,7 @@
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec Vlv2TbltDevicePkg/PlatformPkg.dec
IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h Vlv2SocBinPkg/Vlv2SocBinPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
[LibraryClasses] [LibraryClasses]

75
Vlv2TbltDevicePkg/Readme.md Normal file
View 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\"

4
Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
View File

@ -190,8 +190,8 @@ for %%i in (%BIOS_Names%) do (
echo. echo.
echo Generating IFWI... %BIOS_ID%.bin echo Generating IFWI... %BIOS_ID%.bin
echo. 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.
echo =========================================================================== echo ===========================================================================
) )

110
Vlv2TbltDevicePkg/bld_vlv.bat
View File

@ -1,7 +1,7 @@
@REM @file @REM @file
@REM Windows batch file to build BIOS ROM @REM Windows batch file to build BIOS ROM
@REM @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 This program and the accompanying materials
@REM are licensed and made available under the terms and conditions of the BSD License @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 @REM which accompanies this distribution. The full text of the license may be found at
@ -17,38 +17,43 @@ echo.
echo %date% %time% echo %date% %time%
echo. echo.
::********************************************************************** ::**********************************************************************
:: Initial Setup :: Initial Setup
::********************************************************************** ::**********************************************************************
REM set WORKSPACE=%CD% set WORKSPACE=%CD%
REM if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1% if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%
set /a build_threads=1 set /a build_threads=1
set "Build_Flags= " set "Build_Flags= "
set exitCode=0 set exitCode=0
set Arch=X64 set Arch=X64
set Source=0 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. :: Clean up previous build files.
if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log if exist %CORE_PATH%\edk2.log del %CORE_PATH%\edk2.log
if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report if exist %CORE_PATH%\unitool.log del %CORE_PATH%\unitool.log
if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log if exist %CORE_PATH%\Conf\target.txt del %CORE_PATH%\Conf\target.txt
if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt if exist %CORE_PATH%\Conf\tools_def.txt del %CORE_PATH%\Conf\tools_def.txt
if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt if exist %CORE_PATH%\Conf\build_rule.txt del %CORE_PATH%\Conf\build_rule.txt
if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt if exist %CORE_PATH%\Conf\FrameworkDatabase.db del %CORE_PATH%\Conf\FrameworkDatabase.db
if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db if exist conf\.cache rmdir /q/s conf\.cache
if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf :: 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 :: 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 @echo off
:: Define platform specific environment variables. :: Define platform specific environment variables.
set PLATFORM_PACKAGE=Vlv2TbltDevicePkg set PLATFORM_NAME=Vlv2TbltDevicePkg
set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc set PLATFORM_PACKAGE=%PLATFORM_PATH%\Vlv2TbltDevicePkg
set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt 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 ::create new AutoPlatformCFG.txt file
copy /y nul %auto_config_inc% >nul 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"=="/?" goto Usage
if /i "%~1"=="/l" ( 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 shift
goto OptLoop 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\ ::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\
if "%Arch%"=="IA32" ( 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% echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%
) else if "%Arch%"=="X64" ( ) 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% echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%
) )
:: -- Build flags settings for each Platform -- :: -- Build flags settings for each Platform --
echo Setting %1 platform configuration and BIOS ID... echo Setting %1 platform configuration and BIOS ID...
if /i "%~1" == "MNW2" ( 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% echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%
) else ( ) else (
@ -130,24 +135,24 @@ set Platform_Type=%~1
if /i "%~2" == "RELEASE" ( if /i "%~2" == "RELEASE" (
set target=RELEASE set target=RELEASE
echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env echo BUILD_TYPE = R >> Conf\BiosId.env
) else ( ) else (
set target=DEBUG set target=DEBUG
echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env echo BUILD_TYPE = D >> Conf\BiosId.env
) )
::********************************************************************** ::**********************************************************************
:: Additional EDK Build Setup/Configuration :: Additional EDK Build Setup/Configuration
::********************************************************************** ::**********************************************************************
echo. 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 defined VS140COMNTOOLS (
if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat" if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat"
if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" ( if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" (
set TOOL_CHAIN_TAG=VS2015 set TOOL_CHAIN_TAG=VS2015
) else ( ) else (
set TOOL_CHAIN_TAG=VS2015x86 set TOOL_CHAIN_TAG=VS2015x86
) )
) else if defined VS120COMNTOOLS ( ) else if defined VS120COMNTOOLS (
if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat" if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"
if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" ( if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (
@ -177,34 +182,34 @@ if defined VS140COMNTOOLS (
set TOOL_CHAIN_TAG=VS2008x86 set TOOL_CHAIN_TAG=VS2008x86
) )
) else ( ) 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. echo.
goto :BldFail goto :BldFail
) )
echo Ensuring correct build directory is present for GenBiosId... 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... echo Modifing Conf files for this build...
:: Remove lines with these tags from target.txt :: 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" ( if "%Arch%"=="IA32" (
echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp echo TARGET_ARCH = IA32 >> Conf\target.txt.tmp
) else if "%Arch%"=="X64" ( ) 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 TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> Conf\target.txt.tmp
echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp echo BUILD_RULE_CONF = Conf/build_rule.txt >> Conf\target.txt.tmp
if %Source% == 0 ( 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 ( ) 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 :: Build BIOS
@ -212,11 +217,11 @@ move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
echo Creating BiosId... echo Creating BiosId...
pushd %PLATFORM_PACKAGE% pushd %PLATFORM_PACKAGE%
if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32 if not exist %WORKSPACE%\%BUILD_PATH%\IA32 mkdir %WORKSPACE%\%BUILD_PATH%\IA32
GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat 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 "%Arch%"=="X64" (
if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64 if not exist %WORKSPACE%\%BUILD_PATH%\X64 mkdir %WORKSPACE%\%BUILD_PATH%\X64
GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\X64\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat
) )
popd popd
@ -237,24 +242,23 @@ echo Running fce...
pushd %PLATFORM_PACKAGE% pushd %PLATFORM_PACKAGE%
:: Extract Hii data from build and store in HiiDefaultData.txt :: 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 :: 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 popd
if %ERRORLEVEL% NEQ 0 goto BldFail if %ERRORLEVEL% NEQ 0 goto BldFail
::echo FD successfully updated with default Hii values. ::echo FD successfully updated with default Hii values.
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables :: 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 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j
del /f/q ver_strings >nul del /f/q ver_strings >nul
set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM 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 %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd %PLATFORM_PATH%\%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 %WORKSPACE%\%BUILD_PATH%\FV\Vlv.ROM >nul
echo. echo.
echo Build location: %BUILD_PATH% echo Build location: %BUILD_PATH%
@ -264,13 +268,13 @@ echo -------------------- The EDKII BIOS build has successfully completed. -----
echo. echo.
@REM build capsule here @REM build capsule here
if "%openssl_path%" == "" ( @REMif "%openssl_path%" == "" (
echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated. @REM echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated.
set exitCode=1 @REM set exitCode=1
goto Exit @REM goto Exit
) @REM
echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv @REM echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv
build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc @REM build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc
goto Exit goto Exit