From: Zailiang Sun <zailiang.sun@intel.com>
To: edk2-devel@lists.01.org
Cc: David Wei <david.wei@intel.com>, Yi Qian <yi.qian@intel.com>,
Michael Kinney <michael.d.kinney@intel.com>
Subject: [PATCH 2/2] Vlv2TbltDevicePkg: Fix build failure issue after ECP cleanup
Date: Mon, 25 Feb 2019 19:04:22 +0800 [thread overview]
Message-ID: <20190225110422.38876-1-zailiang.sun@intel.com> (raw)
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>
---
.../FirmwareUpdate/FirmwareUpdate.inf | 177 ++++++------
Vlv2TbltDevicePkg/Build_IFWI.bat | 35 ++-
.../MultiPlatformLib/MultiPlatformLib.inf | 166 +++++------
.../MonoStatusCode/MonoStatusCode.inf | 156 +++++-----
.../PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf | 122 ++++----
.../PlatformInitPei/PlatformInitPei.inf | 246 ++++++++--------
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf | 270 +++++++++---------
Vlv2TbltDevicePkg/PlatformPkg.fdf | 8 +-
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 4 +-
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 4 +-
Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf | 2 +-
Vlv2TbltDevicePkg/Readme.md | 75 +++++
Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat | 4 +-
Vlv2TbltDevicePkg/bld_vlv.bat | 110 +++----
14 files changed, 727 insertions(+), 652 deletions(-)
create mode 100644 Vlv2TbltDevicePkg/Readme.md
diff --git a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
index 4e2ec32ac6..8ca7a663cd 100644
--- a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
+++ b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
@@ -1,90 +1,89 @@
-## @file
-# 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.
-#
-# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
-#
-# 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 full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-#
-##
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = FirmwareUpdate
- FILE_GUID = AEFAF26C-FB6D-4fef-AF7A-9D78FF201FCA
- MODULE_TYPE = UEFI_APPLICATION
- VERSION_STRING = 1.0
- ENTRY_POINT = ShellCEntryLib
-
-#
-# The following information is for reference only and not required by the build tools.
-#
-# VALID_ARCHITECTURES = X64
-#
-
-[Sources]
- FirmwareUpdateStrings.uni
- FirmwareUpdate.c
- FirmwareUpdate.h
-
-[Packages]
- MdeModulePkg/MdeModulePkg.dec
- MdePkg/MdePkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- ShellPkg/ShellPkg.dec
-
-[LibraryClasses]
- BaseLib
- BaseMemoryLib
- CacheMaintenanceLib
- DebugLib
- FileHandleLib
- #FlashDeviceLib
- #SpiFlashCommonLib
- MemoryAllocationLib
- PcdLib
- ShellCEntryLib
- ShellLib
- UefiApplicationEntryPoint
- UefiBootServicesTableLib
- UefiLib
- UefiRuntimeServicesTableLib
-
-[Protocols]
- gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_CONSUMED
- gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_CONSUMED
- gEfiSpiProtocolGuid
-
-[Pcd]
- gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize ## CONSUMES
-
-[FixedPcd]
-# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
-# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
-# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
-# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
-# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
-# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
-
- gPlatformModuleTokenSpaceGuid.PcdFlashChipBase
- gPlatformModuleTokenSpaceGuid.PcdFlashChipSize
- gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase
- gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize
- gPlatformModuleTokenSpaceGuid.PcdTxeRomBase
- gPlatformModuleTokenSpaceGuid.PcdTxeRomSize
- gPlatformModuleTokenSpaceGuid.PcdBiosRomBase
- gPlatformModuleTokenSpaceGuid.PcdBiosRomSize
-
-[BuildOptions]
- MSFT:*_*_X64_CC_FLAGS = /Od
+## @file
+# 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.
+#
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#
+# 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 full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+#
+##
+
+[Defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = FirmwareUpdate
+ FILE_GUID = AEFAF26C-FB6D-4fef-AF7A-9D78FF201FCA
+ MODULE_TYPE = UEFI_APPLICATION
+ VERSION_STRING = 1.0
+ ENTRY_POINT = ShellCEntryLib
+
+#
+# The following information is for reference only and not required by the build tools.
+#
+# VALID_ARCHITECTURES = X64
+#
+
+[Sources]
+ FirmwareUpdateStrings.uni
+ FirmwareUpdate.c
+ FirmwareUpdate.h
+
+[Packages]
+ MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ ShellPkg/ShellPkg.dec
+
+[LibraryClasses]
+ BaseLib
+ BaseMemoryLib
+ CacheMaintenanceLib
+ DebugLib
+ FileHandleLib
+ #FlashDeviceLib
+ #SpiFlashCommonLib
+ MemoryAllocationLib
+ PcdLib
+ ShellCEntryLib
+ ShellLib
+ UefiApplicationEntryPoint
+ UefiBootServicesTableLib
+ UefiLib
+ UefiRuntimeServicesTableLib
+
+[Protocols]
+ gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_CONSUMED
+ gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL ALWAYS_CONSUMED
+ gEfiSpiProtocolGuid
+
+[Pcd]
+ gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize ## CONSUMES
+
+[FixedPcd]
+# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
+# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
+# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
+# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
+# gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
+
+ gPlatformModuleTokenSpaceGuid.PcdFlashChipBase
+ gPlatformModuleTokenSpaceGuid.PcdFlashChipSize
+ gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase
+ gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize
+ gPlatformModuleTokenSpaceGuid.PcdTxeRomBase
+ gPlatformModuleTokenSpaceGuid.PcdTxeRomSize
+ gPlatformModuleTokenSpaceGuid.PcdBiosRomBase
+ gPlatformModuleTokenSpaceGuid.PcdBiosRomSize
+
+[BuildOptions]
+ MSFT:*_*_X64_CC_FLAGS = /Od
INTEL:*_*_X64_CC_FLAGS = /Od
\ No newline at end of file
diff --git a/Vlv2TbltDevicePkg/Build_IFWI.bat b/Vlv2TbltDevicePkg/Build_IFWI.bat
index c8e3ec3d76..a590c8f4c8 100644
--- a/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -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,15 +143,12 @@ 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
-)
- :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]
- call IFWIStitch.bat %Stitch_Flags% /B %WORKSPACE%\%BIOS_Name% %IFWI_Suffix%
+pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch
+
+ :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]
+ call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%
- @echo off
+ @echo off
popd
if %ERRORLEVEL% NEQ 0 (
echo echo -- Error Stitching %BIOS_Nam% & echo.
@@ -188,7 +185,7 @@ set exitCode=1
:Exit
@REM CD to platform package.
-cd %ROOT_DIR%\Vlv2TbltDevicePkg
+cd %PLATFORM_PATH%
exit /b %exitCode%
EndLocal
diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
index 74ffc78c91..5437843e69 100644
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
@@ -1,83 +1,83 @@
-#
-#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-#
-# 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 full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-#
-#
-# Module Name:
-#
-# MultiPlatform.inf
-#
-# Abstract:
-#
-#
---*/
-
-
-[defines]
- INF_VERSION = 0x00010005
- BASE_NAME = MultiPlatformLib
- FILE_GUID = AB83A52B-B44A-462c-B099-444CC0ED274D
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- LIBRARY_CLASS = MultiPlatformLib
- PI_SPECIFICATION_VERSION = 0x0001000A
-
-[sources]
- MultiPlatformLib.c
- MultiPlatformLib.h
- PlatformInfoHob.c
-#GPIO
- BoardGpios/BoardGpios.c
- BoardGpios/BoardGpios.h
-
-#ClkGen
- BoardClkGens/BoardClkGens.c
- BoardClkGens/BoardClkGens.h
-
-#Jumper
- BoardJumpers/BoardJumpers.c
- BoardJumpers/BoardJumpers.h
-
-#OemId
- BoardOemIds/BoardOemIds.c
- BoardOemIds/BoardOemIds.h
-
-#SSIDSVID
- BoardSsidSvid/BoardSsidSvid.c
- BoardSsidSvid/BoardSsidSvid.h
-[Guids]
-
- gEfiPlatformInfoGuid # ALWAYS_CONSUMED
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
-
-[LibraryClasses]
- DebugLib
- HobLib
- IoLib
-# PeiKscLib
-
-[Ppis]
- gEfiPeiReadOnlyVariable2PpiGuid
-
-[Pcd.common]
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
-
-[Guids]
- gEfiSetupVariableGuid
+#
+#
+# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+#
+# 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 full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+#
+#
+# Module Name:
+#
+# MultiPlatform.inf
+#
+# Abstract:
+#
+#
+--*/
+
+
+[defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = MultiPlatformLib
+ FILE_GUID = AB83A52B-B44A-462c-B099-444CC0ED274D
+ MODULE_TYPE = PEIM
+ VERSION_STRING = 1.0
+ LIBRARY_CLASS = MultiPlatformLib
+ PI_SPECIFICATION_VERSION = 0x0001000A
+
+[sources]
+ MultiPlatformLib.c
+ MultiPlatformLib.h
+ PlatformInfoHob.c
+#GPIO
+ BoardGpios/BoardGpios.c
+ BoardGpios/BoardGpios.h
+
+#ClkGen
+ BoardClkGens/BoardClkGens.c
+ BoardClkGens/BoardClkGens.h
+
+#Jumper
+ BoardJumpers/BoardJumpers.c
+ BoardJumpers/BoardJumpers.h
+
+#OemId
+ BoardOemIds/BoardOemIds.c
+ BoardOemIds/BoardOemIds.h
+
+#SSIDSVID
+ BoardSsidSvid/BoardSsidSvid.c
+ BoardSsidSvid/BoardSsidSvid.h
+[Guids]
+
+ gEfiPlatformInfoGuid # ALWAYS_CONSUMED
+
+[Packages]
+ MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ IntelFrameworkPkg/IntelFrameworkPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ Vlv2SocBinPkg/Vlv2SocBinPkg.dec
+
+[LibraryClasses]
+ DebugLib
+ HobLib
+ IoLib
+# PeiKscLib
+
+[Ppis]
+ gEfiPeiReadOnlyVariable2PpiGuid
+
+[Pcd.common]
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
+
+[Guids]
+ gEfiSetupVariableGuid
diff --git a/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf b/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
index d16c04d83f..36cbb83d2c 100644
--- a/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
+++ b/Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
@@ -1,78 +1,78 @@
-#
-#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-#
-# 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 full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-# Module Name:
-#
-# MonoStatusCode.inf
-#
-# Abstract:
-#
-# Component description file for Status Code PEI module
-#
-#--*/
-
-[defines]
- INF_VERSION = 0x00010005
- BASE_NAME = MonoStatusCode
- FILE_GUID = 4BB346D2-8076-4671-8BC9-7B95CBB9A6DF
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
-# ENTRY_POINT = InstallMonoStatusCode
- LIBRARY_CLASS = MonoStatusCodeLib
-
-[sources.common]
- MonoStatusCode.c
- MonoStatusCode.h
- PlatformStatusCode.c
- PlatformStatusCode.h
- PeiPostCode.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
-
-[LibraryClasses]
- PeimEntryPoint
- HobLib
- DebugLib
- SerialPortLib
- ReportStatusCodeLib
- PrintLib
- BaseMemoryLib
- PchPlatformLib
-
-[Ppis]
- gEfiPeiMemoryDiscoveredPpiGuid
- gEfiPeiStatusCodePpiGuid
- gEfiPeiFvFileLoaderPpiGuid
-
-[Protocols]
- gEfiStatusCodeRuntimeProtocolGuid
-
-[Pcd]
- gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam
-
-[Guids]
- gEfiPlatformCpuInfoGuid
- gEfiHtBistHobGuid
- gEfiStatusCodeDataTypeStringGuid ## CONSUMES
-
-[Depex]
- TRUE
-
-
-
+#
+#
+# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+#
+# 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 full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+# Module Name:
+#
+# MonoStatusCode.inf
+#
+# Abstract:
+#
+# Component description file for Status Code PEI module
+#
+#--*/
+
+[defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = MonoStatusCode
+ FILE_GUID = 4BB346D2-8076-4671-8BC9-7B95CBB9A6DF
+ MODULE_TYPE = PEIM
+ VERSION_STRING = 1.0
+# ENTRY_POINT = InstallMonoStatusCode
+ LIBRARY_CLASS = MonoStatusCodeLib
+
+[sources.common]
+ MonoStatusCode.c
+ MonoStatusCode.h
+ PlatformStatusCode.c
+ PlatformStatusCode.h
+ PeiPostCode.c
+
+[Packages]
+ MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ Vlv2SocBinPkg/Vlv2SocBinPkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ IntelFrameworkPkg/IntelFrameworkPkg.dec
+
+[LibraryClasses]
+ PeimEntryPoint
+ HobLib
+ DebugLib
+ SerialPortLib
+ ReportStatusCodeLib
+ PrintLib
+ BaseMemoryLib
+ PchPlatformLib
+
+[Ppis]
+ gEfiPeiMemoryDiscoveredPpiGuid
+ gEfiPeiStatusCodePpiGuid
+ gEfiPeiFvFileLoaderPpiGuid
+
+[Protocols]
+ gEfiStatusCodeRuntimeProtocolGuid
+
+[Pcd]
+ gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam
+
+[Guids]
+ gEfiPlatformCpuInfoGuid
+ gEfiHtBistHobGuid
+ gEfiStatusCodeDataTypeStringGuid ## CONSUMES
+
+[Depex]
+ TRUE
+
+
+
diff --git a/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf b/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
index a0e99fb152..440df3455a 100644
--- a/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
+++ b/Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
@@ -1,61 +1,61 @@
-#/*++
-#
-# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
-#
-# 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 full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-
-#
-# Module Name:
-#
-# PlatformCpuInfoDxe.inf
-#
-# Abstract:
-#
-#
---*/
-
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PlatformCpuInfoDxe
- FILE_GUID = 025F738B-4EBD-4d55-B728-5F421B601F20
- MODULE_TYPE = DXE_DRIVER
- VERSION_STRING = 1.0
- ENTRY_POINT = PlatformCpuInfoInit
-
-[Sources]
- PlatformCpuInfoDxe.c
- PlatformCpuInfoDxe.h
-
-[Guids]
- gEfiPlatformCpuInfoGuid
- gEfiVlv2VariableGuid
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-
-[LibraryClasses]
- HobLib
- UefiRuntimeServicesTableLib
- UefiDriverEntryPoint
-
-[BuildOptions]
- MSFT:*_*_*_CC_FLAGS = /Od /GL-
- INTEL:*_*_*_CC_FLAGS = /Od /GL-
-
-[Depex]
- gEfiVariableArchProtocolGuid AND
- gEfiVariableWriteArchProtocolGuid
-
+#/*++
+#
+# Copyright (c) 1999 - 2014, Intel Corporation. All rights reserved
+#
+# 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 full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+
+#
+# Module Name:
+#
+# PlatformCpuInfoDxe.inf
+#
+# Abstract:
+#
+#
+--*/
+
+
+[Defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = PlatformCpuInfoDxe
+ FILE_GUID = 025F738B-4EBD-4d55-B728-5F421B601F20
+ MODULE_TYPE = DXE_DRIVER
+ VERSION_STRING = 1.0
+ ENTRY_POINT = PlatformCpuInfoInit
+
+[Sources]
+ PlatformCpuInfoDxe.c
+ PlatformCpuInfoDxe.h
+
+[Guids]
+ gEfiPlatformCpuInfoGuid
+ gEfiVlv2VariableGuid
+
+[Packages]
+ MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ Vlv2SocBinPkg/Vlv2SocBinPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+
+[LibraryClasses]
+ HobLib
+ UefiRuntimeServicesTableLib
+ UefiDriverEntryPoint
+
+[BuildOptions]
+ MSFT:*_*_*_CC_FLAGS = /Od /GL-
+ INTEL:*_*_*_CC_FLAGS = /Od /GL-
+
+[Depex]
+ gEfiVariableArchProtocolGuid AND
+ gEfiVariableWriteArchProtocolGuid
+
diff --git a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
index 309487d854..ad9f9c544c 100644
--- a/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
+++ b/Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
@@ -1,123 +1,123 @@
-#
-#
-# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved
-#
-# 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 full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-#
-# Module Name:
-#
-# PlatformEarlyInit.inf
-#
-# Abstract:
-#
-# Component description file for PlatformEarlyInit module
-#
-#--*/
-
-[defines]
-INF_VERSION = 0x00010005
-BASE_NAME = PlatformEarlyInit
-FILE_GUID = 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0
-MODULE_TYPE = PEIM
-VERSION_STRING = 1.0
-PI_SPECIFICATION_VERSION = 0x0001000A
-ENTRY_POINT = PlatformEarlyInitEntry
-
-[sources.common]
- BootMode.c
- CpuInitPeim.c
- PchInitPeim.c
- MchInit.c
- MemoryCallback.c
- MemoryPeim.c
- PlatformEarlyInit.c
- PlatformEarlyInit.h
- PlatformInfoInit.c
- LegacySpeaker.c
- LegacySpeaker.h
- Stall.c
- PlatformSsaInitPeim.c
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
- UefiCpuPkg/UefiCpuPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
-
-[LibraryClasses]
- PeimEntryPoint
- DebugLib
- HobLib
- IoLib
-# PeiKscLib
- MultiPlatformLib
- PcdLib
- PchPlatformLib
- MtrrLib
-
-[Ppis]
- gEfiPeiStallPpiGuid
- gPeiSpeakerInterfacePpiGuid
- gEfiPeiMemoryDiscoveredPpiGuid
- gVlvPolicyPpiGuid
- gEfiPeiReadOnlyVariable2PpiGuid
- gEfiPeiResetPpiGuid
- gEfiEndOfPeiSignalPpiGuid
- gPeiSmbusPolicyPpiGuid
- gEfiFindFvPpiGuid
- gPeiCapsulePpiGuid
- gEfiPeiBootInRecoveryModePpiGuid
- gEfiPeiRecoveryModulePpiGuid
- gEfiPeiDeviceRecoveryModulePpiGuid
- gPeiCachePpiGuid
- gEfiPeiMasterBootModePpiGuid
- gEfiPeiSmbusPpiGuid
- gPchInitPpiGuid
- gPchUsbPolicyPpiGuid
-
-[Guids]
- gEfiSetupVariableGuid
- gEfiPlatformInfoGuid
- gEfiPlatformBootModeGuid
- gEfiPlatformCpuInfoGuid
- gEfiGlobalVariableGuid
- gRecoveryOnFatFloppyDiskGuid
- gRecoveryOnFatUsbDiskGuid
- gRecoveryOnFatIdeDiskGuid
- gRecoveryOnDataCdGuid
- gMfgModeVariableGuid
- gEfiNormalSetupGuid
- gEfiMemoryTypeInformationGuid
- gOsSelectionVariableGuid
- gEfiSmmPeiSmramMemoryReserveGuid
-
-[Pcd.common]
- gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
- gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
- gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress
-
- gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
- gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
- gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
- gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
-
-[Pcd]
- gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState
-
-[Depex]
- gEfiPeiReadOnlyVariable2PpiGuid AND gPeiCachePpiGuid
+#
+#
+# Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved
+#
+# 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 full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+#
+# Module Name:
+#
+# PlatformEarlyInit.inf
+#
+# Abstract:
+#
+# Component description file for PlatformEarlyInit module
+#
+#--*/
+
+[defines]
+INF_VERSION = 0x00010005
+BASE_NAME = PlatformEarlyInit
+FILE_GUID = 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0
+MODULE_TYPE = PEIM
+VERSION_STRING = 1.0
+PI_SPECIFICATION_VERSION = 0x0001000A
+ENTRY_POINT = PlatformEarlyInitEntry
+
+[sources.common]
+ BootMode.c
+ CpuInitPeim.c
+ PchInitPeim.c
+ MchInit.c
+ MemoryCallback.c
+ MemoryPeim.c
+ PlatformEarlyInit.c
+ PlatformEarlyInit.h
+ PlatformInfoInit.c
+ LegacySpeaker.c
+ LegacySpeaker.h
+ Stall.c
+ PlatformSsaInitPeim.c
+
+[Packages]
+ MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ IntelFrameworkPkg/IntelFrameworkPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ Vlv2SocBinPkg/Vlv2SocBinPkg.dec
+ UefiCpuPkg/UefiCpuPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+
+[LibraryClasses]
+ PeimEntryPoint
+ DebugLib
+ HobLib
+ IoLib
+# PeiKscLib
+ MultiPlatformLib
+ PcdLib
+ PchPlatformLib
+ MtrrLib
+
+[Ppis]
+ gEfiPeiStallPpiGuid
+ gPeiSpeakerInterfacePpiGuid
+ gEfiPeiMemoryDiscoveredPpiGuid
+ gVlvPolicyPpiGuid
+ gEfiPeiReadOnlyVariable2PpiGuid
+ gEfiPeiResetPpiGuid
+ gEfiEndOfPeiSignalPpiGuid
+ gPeiSmbusPolicyPpiGuid
+ gEfiFindFvPpiGuid
+ gPeiCapsulePpiGuid
+ gEfiPeiBootInRecoveryModePpiGuid
+ gEfiPeiRecoveryModulePpiGuid
+ gEfiPeiDeviceRecoveryModulePpiGuid
+ gPeiCachePpiGuid
+ gEfiPeiMasterBootModePpiGuid
+ gEfiPeiSmbusPpiGuid
+ gPchInitPpiGuid
+ gPchUsbPolicyPpiGuid
+
+[Guids]
+ gEfiSetupVariableGuid
+ gEfiPlatformInfoGuid
+ gEfiPlatformBootModeGuid
+ gEfiPlatformCpuInfoGuid
+ gEfiGlobalVariableGuid
+ gRecoveryOnFatFloppyDiskGuid
+ gRecoveryOnFatUsbDiskGuid
+ gRecoveryOnFatIdeDiskGuid
+ gRecoveryOnDataCdGuid
+ gMfgModeVariableGuid
+ gEfiNormalSetupGuid
+ gEfiMemoryTypeInformationGuid
+ gOsSelectionVariableGuid
+ gEfiSmmPeiSmramMemoryReserveGuid
+
+[Pcd.common]
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
+ gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress
+
+ gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
+ gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
+
+[Pcd]
+ gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable
+ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState
+
+[Depex]
+ gEfiPeiReadOnlyVariable2PpiGuid AND gPeiCachePpiGuid
diff --git a/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf b/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
index 2ecb347d18..416be16399 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
+++ b/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
@@ -1,135 +1,135 @@
-#
-#
-# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved
-#
-# 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 full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#
-# This PEIM includes 3 parts, pre memory initialization, MRC
-# wrapper and post memory initialization.
-# On pre memory, following action is performed,
-# 1. Initizluize GMCH.
-# 2. Detect boot mode.
-# 3. Detect video adapter to determine whether we need pre allocated
-# memory.
-#
-# After that MRC wrapper calls MRC to initialize memory and install a PPI
-# notify to do post memory
-# initialization. MRC wrapper performance following actions,
-# 1. Install EFI Memory.
-# 2. Capsule coalesce if capsule boot mode.
-# 3. Create HOB of system memory.
-# Note: MRC supports 3 kinds of chipsets including Lakeport, Glenwood and Mukilteo,
-# so please don't define MACRO MUKILTEO_SUPPORT on Lakeport here.
-#
-# On post memory, following action is performed,
-# 1. TC initialization after MRC.
-# 2. SIO initialization.
-# 3. Install ResetSystem and FinvFv PPI, relocate Stall to memory on
-# recovery boot mode.
-# 4. Set MTRR for PEI
-# 5. Create FV HOB and Flash HOB
-# 6. Install RecoveryModule and AtaController PPI if on recovery boot mode.
-#
-# This PEIM does not have any register access directly, it depends on
-# IntelTCLib, TCAccess libraries to access Chipset
-# registers.
-#
-# Platform.c - Provide main flow and entrypoint of PEIM.
-# MemoryCallback.c - Includes a memory call back function notified when
-# MRC is done.
-#
-#
-
-[Defines]
- INF_VERSION = 0x00010005
- BASE_NAME = PlatformPeim
- FILE_GUID = 9618C0DC-50A4-496c-994F-7241F282ED01
- MODULE_TYPE = PEIM
- VERSION_STRING = 1.0
- ENTRY_POINT = PeiInitPlatform
- PI_SPECIFICATION_VERSION = 0x0001000A
-
-[sources.common]
- Platform.c
- Platform.h
- MemoryCallback.c
- CommonHeader.h
- Stall.c
- BootMode.c
-
-
-[Packages]
- MdePkg/MdePkg.dec
- MdeModulePkg/MdeModulePkg.dec
- Vlv2TbltDevicePkg/PlatformPkg.dec
- IntelFrameworkPkg/IntelFrameworkPkg.dec
- Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec
- UefiCpuPkg/UefiCpuPkg.dec
- CryptoPkg/CryptoPkg.dec
-
-[LibraryClasses]
- PeimEntryPoint
- DebugLib
- HobLib
- IoLib
- MultiPlatformLib
- MtrrLib
- PerformanceLib
- MonoStatusCodeLib
- BaseCryptLib
- PciLib
-
-[Ppis]
- gEfiPeiStallPpiGuid
- gPeiSpeakerInterfacePpiGuid
- gEfiPeiMemoryDiscoveredPpiGuid
- gVlvPolicyPpiGuid
- gEfiPeiReadOnlyVariable2PpiGuid
- gEfiPeiResetPpiGuid
- gEfiEndOfPeiSignalPpiGuid
- gEfiFindFvPpiGuid
- gPeiCapsulePpiGuid
- gEfiPeiBootInRecoveryModePpiGuid
- gEfiPeiRecoveryModulePpiGuid
- gEfiPeiDeviceRecoveryModulePpiGuid
- gPeiCachePpiGuid
- gEfiPeiMasterBootModePpiGuid
- gEfiPeiSmbusPpiGuid
- gPeiMfgMemoryTestPpiGuid
- gPeiSha256HashPpiGuid
- gVlvMmioPolicyPpiGuid
- gSeCfTPMPolicyPpiGuid
-
-[Guids]
- gEfiSetupVariableGuid
- gEfiPlatformInfoGuid
- gEfiPlatformBootModeGuid
- gEfiPlatformCpuInfoGuid
- gEfiGlobalVariableGuid
- gRecoveryOnFatFloppyDiskGuid
- gRecoveryOnFatUsbDiskGuid
- gRecoveryOnFatIdeDiskGuid
- gRecoveryOnDataCdGuid
- gMfgModeVariableGuid
- gEfiNormalSetupGuid
- gEfiVlv2VariableGuid
-
-[Pcd.common]
- gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
- gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
- gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
- gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
- gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
- gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
-[Depex]
- TRUE
-
+#
+#
+# Copyright (c) 1999 - 2018, Intel Corporation. All rights reserved
+#
+# 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 full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php.
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#
+# This PEIM includes 3 parts, pre memory initialization, MRC
+# wrapper and post memory initialization.
+# On pre memory, following action is performed,
+# 1. Initizluize GMCH.
+# 2. Detect boot mode.
+# 3. Detect video adapter to determine whether we need pre allocated
+# memory.
+#
+# After that MRC wrapper calls MRC to initialize memory and install a PPI
+# notify to do post memory
+# initialization. MRC wrapper performance following actions,
+# 1. Install EFI Memory.
+# 2. Capsule coalesce if capsule boot mode.
+# 3. Create HOB of system memory.
+# Note: MRC supports 3 kinds of chipsets including Lakeport, Glenwood and Mukilteo,
+# so please don't define MACRO MUKILTEO_SUPPORT on Lakeport here.
+#
+# On post memory, following action is performed,
+# 1. TC initialization after MRC.
+# 2. SIO initialization.
+# 3. Install ResetSystem and FinvFv PPI, relocate Stall to memory on
+# recovery boot mode.
+# 4. Set MTRR for PEI
+# 5. Create FV HOB and Flash HOB
+# 6. Install RecoveryModule and AtaController PPI if on recovery boot mode.
+#
+# This PEIM does not have any register access directly, it depends on
+# IntelTCLib, TCAccess libraries to access Chipset
+# registers.
+#
+# Platform.c - Provide main flow and entrypoint of PEIM.
+# MemoryCallback.c - Includes a memory call back function notified when
+# MRC is done.
+#
+#
+
+[Defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = PlatformPeim
+ FILE_GUID = 9618C0DC-50A4-496c-994F-7241F282ED01
+ MODULE_TYPE = PEIM
+ VERSION_STRING = 1.0
+ ENTRY_POINT = PeiInitPlatform
+ PI_SPECIFICATION_VERSION = 0x0001000A
+
+[sources.common]
+ Platform.c
+ Platform.h
+ MemoryCallback.c
+ CommonHeader.h
+ Stall.c
+ BootMode.c
+
+
+[Packages]
+ MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
+ Vlv2TbltDevicePkg/PlatformPkg.dec
+ IntelFrameworkPkg/IntelFrameworkPkg.dec
+ Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
+ Vlv2SocBinPkg/Vlv2SocBinPkg.dec
+ UefiCpuPkg/UefiCpuPkg.dec
+ CryptoPkg/CryptoPkg.dec
+
+[LibraryClasses]
+ PeimEntryPoint
+ DebugLib
+ HobLib
+ IoLib
+ MultiPlatformLib
+ MtrrLib
+ PerformanceLib
+ MonoStatusCodeLib
+ BaseCryptLib
+ PciLib
+
+[Ppis]
+ gEfiPeiStallPpiGuid
+ gPeiSpeakerInterfacePpiGuid
+ gEfiPeiMemoryDiscoveredPpiGuid
+ gVlvPolicyPpiGuid
+ gEfiPeiReadOnlyVariable2PpiGuid
+ gEfiPeiResetPpiGuid
+ gEfiEndOfPeiSignalPpiGuid
+ gEfiFindFvPpiGuid
+ gPeiCapsulePpiGuid
+ gEfiPeiBootInRecoveryModePpiGuid
+ gEfiPeiRecoveryModulePpiGuid
+ gEfiPeiDeviceRecoveryModulePpiGuid
+ gPeiCachePpiGuid
+ gEfiPeiMasterBootModePpiGuid
+ gEfiPeiSmbusPpiGuid
+ gPeiMfgMemoryTestPpiGuid
+ gPeiSha256HashPpiGuid
+ gVlvMmioPolicyPpiGuid
+ gSeCfTPMPolicyPpiGuid
+
+[Guids]
+ gEfiSetupVariableGuid
+ gEfiPlatformInfoGuid
+ gEfiPlatformBootModeGuid
+ gEfiPlatformCpuInfoGuid
+ gEfiGlobalVariableGuid
+ gRecoveryOnFatFloppyDiskGuid
+ gRecoveryOnFatUsbDiskGuid
+ gRecoveryOnFatIdeDiskGuid
+ gRecoveryOnDataCdGuid
+ gMfgModeVariableGuid
+ gEfiNormalSetupGuid
+ gEfiVlv2VariableGuid
+
+[Pcd.common]
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base
+ gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
+ gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress
+ gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize
+[Depex]
+ TRUE
+
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index ff0b32e635..5d947db7bd 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -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
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 117b30dca9..5c2e33cf32 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -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
@@ -1421,7 +1421,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
}
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 34aeb90841..93b16e8db2 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -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
@@ -1433,7 +1433,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
}
diff --git a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
index c5c6076a26..5df5e37a28 100644
--- a/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
+++ b/Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
@@ -35,7 +35,7 @@
[Packages]
MdePkg/MdePkg.dec
Vlv2TbltDevicePkg/PlatformPkg.dec
- IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h
+ Vlv2SocBinPkg/Vlv2SocBinPkg.dec
Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec
[LibraryClasses]
diff --git a/Vlv2TbltDevicePkg/Readme.md b/Vlv2TbltDevicePkg/Readme.md
new file mode 100644
index 0000000000..139aa4ea61
--- /dev/null
+++ b/Vlv2TbltDevicePkg/Readme.md
@@ -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\"
+
+
diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
index 5f19983c91..934fef081c 100644
--- a/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
+++ b/Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
@@ -190,8 +190,8 @@ for %%i in (%BIOS_Names%) do (
echo.
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 ===========================================================================
)
diff --git a/Vlv2TbltDevicePkg/bld_vlv.bat b/Vlv2TbltDevicePkg/bld_vlv.bat
index 27bc4e7c41..cd3ce41342 100644
--- a/Vlv2TbltDevicePkg/bld_vlv.bat
+++ b/Vlv2TbltDevicePkg/bld_vlv.bat
@@ -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,24 +135,24 @@ 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\" (
set TOOL_CHAIN_TAG=VS2015
) else (
set TOOL_CHAIN_TAG=VS2015x86
- )
+ )
) else if defined VS120COMNTOOLS (
if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"
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
)
) 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
--
2.19.1.windows.1
reply other threads:[~2019-02-25 11:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190225110422.38876-1-zailiang.sun@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox