]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Vlv2TbltDevicePkg: Fix build failure issue after ECP cleanup
authorZailiang Sun <zailiang.sun@intel.com>
Thu, 28 Feb 2019 03:12:42 +0000 (11:12 +0800)
committerzwei4 <david.wei@intel.com>
Wed, 20 Mar 2019 05:59:00 +0000 (13:59 +0800)
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>
14 files changed:
Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.inf
Vlv2TbltDevicePkg/Build_IFWI.bat
Vlv2TbltDevicePkg/Library/MultiPlatformLib/MultiPlatformLib.inf
Vlv2TbltDevicePkg/MonoStatusCode/MonoStatusCode.inf
Vlv2TbltDevicePkg/PlatformCpuInfoDxe/PlatformCpuInfoDxe.inf
Vlv2TbltDevicePkg/PlatformInitPei/PlatformInitPei.inf
Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
Vlv2TbltDevicePkg/PlatformPkg.fdf
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
Vlv2TbltDevicePkg/PlatformPkgX64.dsc
Vlv2TbltDevicePkg/PpmPolicy/PpmPolicy.inf
Vlv2TbltDevicePkg/Readme.md [new file with mode: 0644]
Vlv2TbltDevicePkg/Stitch/IFWIStitch.bat
Vlv2TbltDevicePkg/bld_vlv.bat

index 4e2ec32ac601546549120fc38d60e20d1cc0b625..8ca7a663cddbe5c85717f0863d04809a6f26d353 100644 (file)
@@ -1,90 +1,89 @@
-## @file\r
-# Implements a Tunnel Mountain specific flash update program.  This will allow\r
-# users to update all regions of the flash as needed in a given update.\r
-#\r
-# Copyright (c) 2006  - 2014, Intel Corporation. All rights reserved.<BR>\r
-#                                                                                  \r\r
-# This program and the accompanying materials are licensed and made available under\r\r
-# the terms and conditions of the BSD License that accompanies this distribution.  \r\r
-# The full text of the license may be found at                                     \r\r
-# http://opensource.org/licenses/bsd-license.php.                                  \r\r
-#                                                                                  \r\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r\r
-#                                                                                  \r\r
-#\r
-#\r
-##\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = FirmwareUpdate\r
-  FILE_GUID                      = AEFAF26C-FB6D-4fef-AF7A-9D78FF201FCA\r
-  MODULE_TYPE                    = UEFI_APPLICATION\r
-  VERSION_STRING                 = 1.0\r
-  ENTRY_POINT                    = ShellCEntryLib\r
-\r
-#\r
-# The following information is for reference only and not required by the build tools.\r
-#\r
-#  VALID_ARCHITECTURES           = X64\r
-#\r
-\r
-[Sources]\r
-  FirmwareUpdateStrings.uni\r
-  FirmwareUpdate.c\r
-  FirmwareUpdate.h\r
-\r
-[Packages]\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  MdePkg/MdePkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec\r
-  Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  ShellPkg/ShellPkg.dec\r
-\r
-[LibraryClasses]\r
-  BaseLib\r
-  BaseMemoryLib\r
-  CacheMaintenanceLib\r
-  DebugLib\r
-  FileHandleLib\r
-  #FlashDeviceLib\r
-  #SpiFlashCommonLib\r
-  MemoryAllocationLib\r
-  PcdLib\r
-  ShellCEntryLib\r
-  ShellLib\r
-  UefiApplicationEntryPoint\r
-  UefiBootServicesTableLib\r
-  UefiLib\r
-  UefiRuntimeServicesTableLib\r
-\r
-[Protocols]\r
-  gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiSpiProtocolGuid\r
-\r
-[Pcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize   ## CONSUMES\r
-\r
-[FixedPcd]\r
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase\r
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase\r
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
-#  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase\r
-\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashChipBase\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashChipSize\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize\r
-  gPlatformModuleTokenSpaceGuid.PcdTxeRomBase\r
-  gPlatformModuleTokenSpaceGuid.PcdTxeRomSize\r
-  gPlatformModuleTokenSpaceGuid.PcdBiosRomBase\r
-  gPlatformModuleTokenSpaceGuid.PcdBiosRomSize\r
-\r
-[BuildOptions]\r
-  MSFT:*_*_X64_CC_FLAGS       = /Od \r
+## @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
index c8e3ec3d76ccab4491ec9ed0c8fe9447bdebd9b1..a590c8f4c8f8bd09d3383908fe067c61e6e40d08 100644 (file)
@@ -15,7 +15,8 @@
 \r
 SetLocal EnableDelayedExpansion EnableExtensions\r
 \r
-@REM Go to root directory of the codebase.\r
+@REM Go to work space directory.\r
+cd ..\r
 cd ..\r
 \r
 :: Assign initial values\r
@@ -23,8 +24,10 @@ set exitCode=0
 set "Build_Flags= "\r
 set "Stitch_Flags= "\r
 set Arch=X64\r
+set WORKSPACE=%CD%\r
+set CORE_PATH=%WORKSPACE%\edk2\r
+set PLATFORM_PATH=%WORKSPACE%\edk2\r
 set PLATFORM_PACKAGE=Vlv2TbltDevicePkg\r
-set ROOT_DIR=%CD%\r
 \r
 :: Parse Optional arguments\r
 :OptLoop\r
@@ -117,12 +120,9 @@ if "%~3"=="" (
 :: Build BIOS\r
 echo ======================================================================\r
 echo Build_IFWI:  Calling BIOS build Script...\r
-if "%Platform_Type%" == "BYTC" (\r
-    call %PLATFORM_PACKAGE%\bld_vlv_cr.bat %Build_Flags%  %Platform_Type% %Build_Target%\r
\r
-) else (\r
-    call %PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags%  %Platform_Type% %Build_Target%\r
-)\r
+\r
+call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flags%  %Platform_Type% %Build_Target%\r
+\r
 if %ERRORLEVEL% NEQ 0 (\r
     echo echo  -- Error Building BIOS  & echo.\r
     set exitCode=1\r
@@ -131,11 +131,11 @@ if %ERRORLEVEL% NEQ 0 (
 echo.\r
 echo Finished Building BIOS.\r
 @REM Set BIOS_ID environment variable here.\r
-call %WORKSPACE%\Conf\BiosId.bat\r
+call %CORE_PATH%\Conf\BiosId.bat\r
 echo BIOS_ID=%BIOS_ID%\r
 \r
 :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings\r
+find /v "#" %CORE_PATH%\Conf\BiosId.env > ver_strings\r
 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j\r
 del /f/q ver_strings >nul\r
 set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
@@ -143,15 +143,12 @@ set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
 :: Start Integration process\r
 echo ======================================================================\r
 echo Build_IFWI:  Calling IFWI Stitching Script...\r
-if "%Platform_Type%" == "BYTC" (\r
-    pushd %PLATFORM_PACKAGE%\Stitch_CR\r
-) else (\r
-    pushd %PLATFORM_PACKAGE%\Stitch\r
-)\r
-   :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]\r
-   call IFWIStitch.bat %Stitch_Flags% /B %WORKSPACE%\%BIOS_Name% %IFWI_Suffix%\r
+pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch\r
+\r
+  :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]\r
+  call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%\r
    \r
  @echo off\r
+ @echo off\r
 popd\r
 if %ERRORLEVEL% NEQ 0 (\r
     echo echo  -- Error Stitching %BIOS_Nam% & echo.\r
@@ -188,7 +185,7 @@ set exitCode=1
 \r
 :Exit\r
 @REM  CD to platform package.\r
-cd %ROOT_DIR%\Vlv2TbltDevicePkg\r
+cd %PLATFORM_PATH%\r
 exit /b %exitCode%\r
 \r
 EndLocal\r
index 74ffc78c91325b1816cf99e463ed1b892866ed5b..5437843e69af3c0dc917c8cba8b47036161a976a 100644 (file)
@@ -1,83 +1,83 @@
-#\r
-#\r
-# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved\r
-#                                                                                  \r\r
-# This program and the accompanying materials are licensed and made available under\r\r
-# the terms and conditions of the BSD License that accompanies this distribution.  \r\r
-# The full text of the license may be found at                                     \r\r
-# http://opensource.org/licenses/bsd-license.php.                                  \r\r
-#                                                                                  \r\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r\r
-#                                                                                  \r\r
-#\r
-#\r
-#\r
-#  Module Name:\r
-#\r
-#   MultiPlatform.inf\r
-#\r
-#  Abstract:\r
-#\r
-#\r
---*/\r
-\r
-\r
-[defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = MultiPlatformLib\r
-  FILE_GUID                      = AB83A52B-B44A-462c-B099-444CC0ED274D\r
-  MODULE_TYPE                    = PEIM\r
-  VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = MultiPlatformLib\r
-  PI_SPECIFICATION_VERSION       = 0x0001000A\r
-\r
-[sources]\r
-  MultiPlatformLib.c\r
-  MultiPlatformLib.h\r
-  PlatformInfoHob.c\r
-#GPIO\r
-  BoardGpios/BoardGpios.c\r
-  BoardGpios/BoardGpios.h\r
-\r
-#ClkGen\r
-  BoardClkGens/BoardClkGens.c\r
-  BoardClkGens/BoardClkGens.h\r
-\r
-#Jumper\r
-  BoardJumpers/BoardJumpers.c\r
-  BoardJumpers/BoardJumpers.h\r
-\r
-#OemId\r
-  BoardOemIds/BoardOemIds.c\r
-  BoardOemIds/BoardOemIds.h\r
-\r
-#SSIDSVID\r
-  BoardSsidSvid/BoardSsidSvid.c\r
-  BoardSsidSvid/BoardSsidSvid.h\r
-[Guids]\r
-\r
-  gEfiPlatformInfoGuid                     # ALWAYS_CONSUMED\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec\r
-\r
-[LibraryClasses]\r
-  DebugLib\r
-  HobLib\r
-  IoLib\r
-#  PeiKscLib\r
-\r
-[Ppis]\r
-  gEfiPeiReadOnlyVariable2PpiGuid\r
-\r
-[Pcd.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
-\r
-[Guids]\r
-  gEfiSetupVariableGuid\r
+#
+#
+# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
+#                                                                                  \r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.  \r
+# The full text of the license may be found at                                     
+# http://opensource.org/licenses/bsd-license.php.                                  \r
+#                                                                                  \r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r
+#                                                                                  \r
+#
+#
+#
+#  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
index d16c04d83f737350488efe3bf190362f883fa1a2..36cbb83d2c35628320495f4cbbd418abe980451e 100644 (file)
@@ -1,78 +1,78 @@
-#\r
-#\r
-# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved\r
-#                                                                                  \r\r
-# This program and the accompanying materials are licensed and made available under\r\r
-# the terms and conditions of the BSD License that accompanies this distribution.  \r\r
-# The full text of the license may be found at                                     \r\r
-# http://opensource.org/licenses/bsd-license.php.                                  \r\r
-#                                                                                  \r\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r\r
-#                                                                                  \r\r
-#\r
-#  Module Name:\r
-#\r
-#    MonoStatusCode.inf\r
-#\r
-#  Abstract:\r
-#\r
-#    Component description file for Status Code PEI module\r
-#\r
-#--*/\r
-\r
-[defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = MonoStatusCode\r
-  FILE_GUID                      = 4BB346D2-8076-4671-8BC9-7B95CBB9A6DF\r
-  MODULE_TYPE                    = PEIM\r
-  VERSION_STRING                 = 1.0\r
-#  ENTRY_POINT                    = InstallMonoStatusCode\r
-  LIBRARY_CLASS                  = MonoStatusCodeLib\r
-\r
-[sources.common]\r
-  MonoStatusCode.c\r
-  MonoStatusCode.h\r
-  PlatformStatusCode.c\r
-  PlatformStatusCode.h\r
-  PeiPostCode.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec\r
-  Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-\r
-[LibraryClasses]\r
-  PeimEntryPoint\r
-  HobLib\r
-  DebugLib\r
-  SerialPortLib\r
-  ReportStatusCodeLib\r
-  PrintLib\r
-  BaseMemoryLib\r
-  PchPlatformLib\r
-\r
-[Ppis]\r
-  gEfiPeiMemoryDiscoveredPpiGuid\r
-  gEfiPeiStatusCodePpiGuid\r
-  gEfiPeiFvFileLoaderPpiGuid\r
-\r
-[Protocols]\r
-  gEfiStatusCodeRuntimeProtocolGuid\r
-\r
-[Pcd]\r
-  gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseRam\r
-\r
-[Guids]\r
-  gEfiPlatformCpuInfoGuid\r
-  gEfiHtBistHobGuid\r
-  gEfiStatusCodeDataTypeStringGuid              ## CONSUMES\r
-\r
-[Depex]\r
-  TRUE\r
-\r
-\r
-\r
+#
+#
+# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
+#                                                                                  \r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.  \r
+# The full text of the license may be found at                                     \r
+# http://opensource.org/licenses/bsd-license.php.                                  \r
+#                                                                                  \r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r
+#                                                                                  \r
+#
+#  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
+
+
+
index a0e99fb152bc2de65096557d40fd6b9c1a280d38..440df3455a14de6084b1da8770b306b93a0b9f94 100644 (file)
@@ -1,61 +1,61 @@
-#/*++\r
-#\r
-# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved\r
-#                                                                                  \r\r
-# This program and the accompanying materials are licensed and made available under\r\r
-# the terms and conditions of the BSD License that accompanies this distribution.  \r\r
-# The full text of the license may be found at                                     \r\r
-# http://opensource.org/licenses/bsd-license.php.                                  \r\r
-#                                                                                  \r\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r\r
-#                                                                                  \r\r
-\r
-#\r
-#  Module Name:\r
-#\r
-#   PlatformCpuInfoDxe.inf\r
-#\r
-#  Abstract:\r
-#\r
-#\r
---*/\r
-\r
-\r
-[Defines]\r
-  INF_VERSION          = 0x00010005\r
-  BASE_NAME            = PlatformCpuInfoDxe\r
-  FILE_GUID            = 025F738B-4EBD-4d55-B728-5F421B601F20\r
-  MODULE_TYPE          = DXE_DRIVER\r
-  VERSION_STRING       = 1.0\r
-  ENTRY_POINT          = PlatformCpuInfoInit\r
-\r
-[Sources]\r
-  PlatformCpuInfoDxe.c\r
-  PlatformCpuInfoDxe.h\r
-\r
-[Guids]\r
-  gEfiPlatformCpuInfoGuid\r
-  gEfiVlv2VariableGuid\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
-\r
-[LibraryClasses]\r
-  HobLib\r
-  UefiRuntimeServicesTableLib\r
-  UefiDriverEntryPoint\r
-\r
-[BuildOptions]\r
-  MSFT:*_*_*_CC_FLAGS = /Od /GL-\r
-  INTEL:*_*_*_CC_FLAGS = /Od /GL-\r
-\r
-[Depex]\r
-  gEfiVariableArchProtocolGuid AND\r
-  gEfiVariableWriteArchProtocolGuid\r
-\r
+#/*++
+#
+# Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved
+#                                                                                  \r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.  
+# The full text of the license may be found at                                     \r
+# http://opensource.org/licenses/bsd-license.php.                                  \r
+#                                                                                  \r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r
+#                                                                                  \r
+
+#
+#  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
+
index 309487d8548fde3ada2b67bbd368a6a287da8519..ad9f9c544c5c6fa8ac586b471a7e638671fe3935 100644 (file)
-#\r
-#\r
-# Copyright (c)  1999  - 2016, Intel Corporation. All rights reserved\r
-#                                                                                  \r\r
-# This program and the accompanying materials are licensed and made available under\r\r
-# the terms and conditions of the BSD License that accompanies this distribution.  \r\r
-# The full text of the license may be found at                                     \r\r
-# http://opensource.org/licenses/bsd-license.php.                                  \r\r
-#                                                                                  \r\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r\r
-#                                                                                  \r\r
-#\r
-#\r
-#  Module Name:\r
-#\r
-#    PlatformEarlyInit.inf\r
-#\r
-#  Abstract:\r
-#\r
-#    Component description file for PlatformEarlyInit module\r
-#\r
-#--*/\r
-\r
-[defines]\r
-INF_VERSION                               = 0x00010005\r
-BASE_NAME                                         = PlatformEarlyInit\r
-FILE_GUID                                         = 0A5EA2E1-BE0B-44a0-A775-F429C9A018A0\r
-MODULE_TYPE                               = PEIM\r
-VERSION_STRING                            = 1.0\r
-PI_SPECIFICATION_VERSION          = 0x0001000A\r
-ENTRY_POINT                               = PlatformEarlyInitEntry\r
-\r
-[sources.common]\r
-  BootMode.c\r
-  CpuInitPeim.c\r
-  PchInitPeim.c\r
-  MchInit.c\r
-  MemoryCallback.c\r
-  MemoryPeim.c\r
-  PlatformEarlyInit.c\r
-  PlatformEarlyInit.h\r
-  PlatformInfoInit.c\r
-  LegacySpeaker.c\r
-  LegacySpeaker.h\r
-  Stall.c\r
-  PlatformSsaInitPeim.c\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec\r
-  UefiCpuPkg/UefiCpuPkg.dec\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
-\r
-[LibraryClasses]\r
-  PeimEntryPoint\r
-  DebugLib\r
-  HobLib\r
-  IoLib\r
-#  PeiKscLib\r
-  MultiPlatformLib\r
-  PcdLib\r
-  PchPlatformLib\r
-  MtrrLib\r
-\r
-[Ppis]\r
-  gEfiPeiStallPpiGuid\r
-  gPeiSpeakerInterfacePpiGuid\r
-  gEfiPeiMemoryDiscoveredPpiGuid\r
-  gVlvPolicyPpiGuid\r
-  gEfiPeiReadOnlyVariable2PpiGuid\r
-  gEfiPeiResetPpiGuid\r
-  gEfiEndOfPeiSignalPpiGuid\r
-  gPeiSmbusPolicyPpiGuid\r
-  gEfiFindFvPpiGuid\r
-  gPeiCapsulePpiGuid\r
-  gEfiPeiBootInRecoveryModePpiGuid\r
-  gEfiPeiRecoveryModulePpiGuid\r
-  gEfiPeiDeviceRecoveryModulePpiGuid\r
-  gPeiCachePpiGuid\r
-  gEfiPeiMasterBootModePpiGuid\r
-  gEfiPeiSmbusPpiGuid\r
-  gPchInitPpiGuid\r
-  gPchUsbPolicyPpiGuid\r
-\r
-[Guids]\r
-  gEfiSetupVariableGuid\r
-  gEfiPlatformInfoGuid\r
-  gEfiPlatformBootModeGuid\r
-  gEfiPlatformCpuInfoGuid\r
-  gEfiGlobalVariableGuid\r
-  gRecoveryOnFatFloppyDiskGuid\r
-  gRecoveryOnFatUsbDiskGuid\r
-  gRecoveryOnFatIdeDiskGuid\r
-  gRecoveryOnDataCdGuid\r
-  gMfgModeVariableGuid\r
-  gEfiNormalSetupGuid\r
-  gEfiMemoryTypeInformationGuid\r
-  gOsSelectionVariableGuid\r
-  gEfiSmmPeiSmramMemoryReserveGuid\r
-\r
-[Pcd.common]\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize\r
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
-  gEfiIchTokenSpaceGuid.PcdPeiIchEhciControllerMemoryBaseAddress\r
-\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size\r
-\r
-[Pcd]\r
-  gEfiVLVTokenSpaceGuid.PcdMeasuredBootEnable\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootState\r
-\r
-[Depex]\r
-  gEfiPeiReadOnlyVariable2PpiGuid  AND gPeiCachePpiGuid\r
+#
+#
+# Copyright (c)  1999  - 2016, Intel Corporation. All rights reserved
+#                                                                                  \r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.  \r
+# The full text of the license may be found at                                     \r
+# http://opensource.org/licenses/bsd-license.php.                                  \r
+#                                                                                  \r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r
+#                                                                                  \r
+#
+#
+#  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
index 2ecb347d18dd83c37c1687c735571e7ccaf805db..416be163991b4ac58b30cead8d22178348ffa508 100644 (file)
-#\r
-#\r
-# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved\r
-#                                                                                  \r\r
-# This program and the accompanying materials are licensed and made available under\r\r
-# the terms and conditions of the BSD License that accompanies this distribution.  \r\r
-# The full text of the license may be found at                                     \r\r
-# http://opensource.org/licenses/bsd-license.php.                                  \r\r
-#                                                                                  \r\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r\r
-#                                                                                  \r\r
-#\r
-# This PEIM includes 3 parts, pre memory initialization, MRC\r
-#  wrapper and post memory initialization.\r
-#  On pre memory, following action is performed,\r
-#  1. Initizluize GMCH.\r
-#  2. Detect boot mode.\r
-#  3. Detect video adapter to determine whether we need pre allocated\r
-#  memory.\r
-#\r
-#  After that MRC wrapper calls MRC to initialize memory and install a PPI\r
-#  notify to do post memory\r
-#  initialization. MRC wrapper performance following actions,\r
-#  1. Install EFI Memory.\r
-#  2. Capsule coalesce if capsule boot mode.\r
-#  3. Create HOB of system memory.\r
-#  Note: MRC supports 3 kinds of chipsets including Lakeport, Glenwood and Mukilteo,\r
-#   so please don't define MACRO MUKILTEO_SUPPORT on Lakeport here.\r
-#\r
-#  On post memory, following action is performed,\r
-#  1. TC initialization after MRC.\r
-#  2. SIO initialization.\r
-#  3. Install ResetSystem and FinvFv PPI, relocate Stall to memory on\r
-#   recovery boot mode.\r
-#  4. Set MTRR for PEI\r
-#  5. Create FV HOB and Flash HOB\r
-#  6. Install RecoveryModule and AtaController PPI if on recovery boot mode.\r
-#\r
-#  This PEIM does not have any register access directly, it depends on\r
-#  IntelTCLib, TCAccess libraries to access Chipset\r
-#  registers.\r
-#\r
-#  Platform.c - Provide main flow and entrypoint of PEIM.\r
-#  MemoryCallback.c - Includes a memory call back function notified when\r
-#     MRC is done.\r
-#\r
-#\r
-\r
-[Defines]\r
-  INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = PlatformPeim\r
-  FILE_GUID                      = 9618C0DC-50A4-496c-994F-7241F282ED01\r
-  MODULE_TYPE                    = PEIM\r
-  VERSION_STRING                 = 1.0\r
-  ENTRY_POINT                    = PeiInitPlatform\r
-  PI_SPECIFICATION_VERSION        = 0x0001000A\r
-\r
-[sources.common]\r
-  Platform.c\r
-  Platform.h\r
-  MemoryCallback.c\r
-  CommonHeader.h\r
-  Stall.c\r
-  BootMode.c\r
-\r
-\r
-[Packages]\r
-  MdePkg/MdePkg.dec\r
-  MdeModulePkg/MdeModulePkg.dec\r
-  Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec\r
-  UefiCpuPkg/UefiCpuPkg.dec\r
-  CryptoPkg/CryptoPkg.dec\r
-\r
-[LibraryClasses]\r
-  PeimEntryPoint\r
-  DebugLib\r
-  HobLib\r
-  IoLib\r
-  MultiPlatformLib\r
-  MtrrLib\r
-  PerformanceLib\r
-  MonoStatusCodeLib\r
-  BaseCryptLib\r
-  PciLib\r
-\r
-[Ppis]\r
-  gEfiPeiStallPpiGuid\r
-  gPeiSpeakerInterfacePpiGuid\r
-  gEfiPeiMemoryDiscoveredPpiGuid\r
-  gVlvPolicyPpiGuid\r
-  gEfiPeiReadOnlyVariable2PpiGuid\r
-  gEfiPeiResetPpiGuid\r
-  gEfiEndOfPeiSignalPpiGuid\r
-  gEfiFindFvPpiGuid\r
-  gPeiCapsulePpiGuid\r
-  gEfiPeiBootInRecoveryModePpiGuid\r
-  gEfiPeiRecoveryModulePpiGuid\r
-  gEfiPeiDeviceRecoveryModulePpiGuid\r
-  gPeiCachePpiGuid\r
-  gEfiPeiMasterBootModePpiGuid\r
-  gEfiPeiSmbusPpiGuid\r
-  gPeiMfgMemoryTestPpiGuid\r
-  gPeiSha256HashPpiGuid\r
-  gVlvMmioPolicyPpiGuid\r
-  gSeCfTPMPolicyPpiGuid\r
-\r
-[Guids]\r
-  gEfiSetupVariableGuid\r
-  gEfiPlatformInfoGuid\r
-  gEfiPlatformBootModeGuid\r
-  gEfiPlatformCpuInfoGuid\r
-  gEfiGlobalVariableGuid\r
-  gRecoveryOnFatFloppyDiskGuid\r
-  gRecoveryOnFatUsbDiskGuid\r
-  gRecoveryOnFatIdeDiskGuid\r
-  gRecoveryOnDataCdGuid\r
-  gMfgModeVariableGuid\r
-  gEfiNormalSetupGuid\r
-  gEfiVlv2VariableGuid\r
-\r
-[Pcd.common]\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvMainBase\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvMainSize\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size\r
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress\r
-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize\r
-[Depex]\r
-  TRUE\r
-\r
+#
+#
+# Copyright (c)  1999  - 2018, Intel Corporation. All rights reserved
+#                                                                                  \r
+# This program and the accompanying materials are licensed and made available under\r
+# the terms and conditions of the BSD License that accompanies this distribution.  \r
+# The full text of the license may be found at                                     \r
+# http://opensource.org/licenses/bsd-license.php.                                  \r
+#                                                                                  \r
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,            \r
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.    \r
+#                                                                                  \r
+#
+# 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
+
index ff0b32e635a59429db4a4103e523005997e05dd9..5d947db7bd2d6e2a0f03fde88f6711ad4e167719 100644 (file)
@@ -183,7 +183,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTok
 \r
   $(FLASH_REGION_FSPBIN_OFFSET)|$(FLASH_REGION_FSPBIN_SIZE)\r
   gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|gFspWrapperTokenSpaceGuid.PcdFlashFvFspSize\r
-  FILE = Vlv2MiscBinariesPkg/FspBinary/FvFsp.bin\r
+  FILE = Vlv2SocBinPkg/FspBinary/FvFsp.bin\r
 \r
 \r
   $(FLASH_REGION_AZALIABIN_OFFSET)|$(FLASH_REGION_AZALIABIN_SIZE)\r
@@ -571,7 +571,7 @@ INF $(PLATFORM_PACKAGE)/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.inf
  INF $(PLATFORM_PACKAGE)/PlatformGopPolicy/PlatformGopPolicy.inf\r
  FILE DRIVER = FF0C8745-3270-4439-B74F-3E45F8C77064 {\r
   SECTION DXE_DEPEX_EXP = {gPlatformGOPPolicyGuid}\r
-  SECTION PE32 = Vlv2MiscBinariesPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi\r
+  SECTION PE32 = Vlv2SocBinPkg/GOP/7.2.1011/RELEASE_VS2008x86/$(DXE_ARCHITECTURE)/IntelGopDriver.efi\r
   SECTION UI = "IntelGopDriver"\r
 }\r
 !endif\r
@@ -711,7 +711,7 @@ INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
 \r
 !if $(GOP_DRIVER_ENABLE) == TRUE\r
 FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {\r
-  SECTION RAW = Vlv2MiscBinariesPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin\r
+  SECTION RAW = Vlv2SocBinPkg/GOP/7.2.1011/VBT/MNW2/Vbt.bin\r
   SECTION UI = "IntelGopVbt"\r
 }\r
 !endif\r
@@ -721,7 +721,7 @@ FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
 #\r
 !if $(NETWORK_ENABLE) == TRUE\r
   FILE DRIVER = 22DE1691-D65D-456a-993E-A253DD1F308C {\r
-    SECTION PE32 = Vlv2MiscBinariesPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi\r
+    SECTION PE32 = Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi\r
     SECTION UI = "UNDI"\r
   }\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
index 7235ac1027bf2fd2471392ec8cb12cdaf00478c6..0b5b976d61a8a86042081904b84d13a6e717b533 100644 (file)
@@ -32,7 +32,7 @@
   #\r
   DEFINE      PLATFORM_PACKAGE                = Vlv2TbltDevicePkg\r
   DEFINE      PLATFORM_RC_PACKAGE             = Vlv2DeviceRefCodePkg\r
-  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2BinaryPkg\r
+  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2SocBinPkg\r
   OUTPUT_DIRECTORY                    = Build/$(PLATFORM_PACKAGE)\r
   SUPPORTED_ARCHITECTURES             = IA32\r
   BUILD_TARGETS                       = DEBUG|RELEASE\r
@@ -1420,7 +1420,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   #\r
   # CPU/FW Microde\r
   #\r
-  Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf {\r
+  Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {\r
     <BuildOptions>\r
       *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF\r
   }\r
index c60e4c70eabbbdd59a46a6befb8e7eb788ee4492..1940aead0335fd9e86d98eed55068dd8b674ca90 100644 (file)
@@ -32,7 +32,7 @@
   #\r
   DEFINE      PLATFORM_PACKAGE                = Vlv2TbltDevicePkg\r
   DEFINE      PLATFORM_RC_PACKAGE             = Vlv2DeviceRefCodePkg\r
-  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2BinaryPkg\r
+  DEFINE      PLATFORM_BINARY_PACKAGE         = Vlv2SocBinPkg\r
   OUTPUT_DIRECTORY                    = Build/$(PLATFORM_PACKAGE)\r
   SUPPORTED_ARCHITECTURES             = IA32|X64\r
   BUILD_TARGETS                       = DEBUG|RELEASE\r
@@ -1432,7 +1432,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   #\r
   # CPU/FW Microde\r
   #\r
-  Vlv2MiscBinariesPkg/Microcode/MicrocodeUpdates.inf {\r
+  Vlv2SocBinPkg/Microcode/MicrocodeUpdates.inf {\r
     <BuildOptions>\r
       *_*_*_GENFW_FLAGS = -a 0x800 -p 0xFF\r
   }\r
index c5c6076a26caebf0fbdf1a3997df0f4c9c0d5b9e..5df5e37a285b2eeed7da1a3930d485bd0f30e976 100644 (file)
@@ -35,7 +35,7 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   Vlv2TbltDevicePkg/PlatformPkg.dec\r
-  IA32FamilyCpuPkg/IA32FamilyCpuPkg.dec #CpuConfigLib.h\r
+  Vlv2SocBinPkg/Vlv2SocBinPkg.dec\r
   Vlv2DeviceRefCodePkg/Vlv2DeviceRefCodePkg.dec\r
 \r
 [LibraryClasses]\r
diff --git a/Vlv2TbltDevicePkg/Readme.md b/Vlv2TbltDevicePkg/Readme.md
new file mode 100644 (file)
index 0000000..139aa4e
--- /dev/null
@@ -0,0 +1,75 @@
+# **EDK II firmware for Minnowboard Max/Turbot which is based on Intel Valleyview2 SoC (Byatrail platform)**\r
+\r
+----------\r
+\r
+\r
+## **How to Create a Full Source Tree for Minnowboard Max/Turbot under Windows**\r
+### Pre-requisites\r
+\r
+* GIT client: Available from https://git-scm.com/downloads\r
+\r
+### Download Source Code\r
+* Create a new directory C:\WORKSPACE as an EDK II work space.\r
+\r
+* 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.\r
+\r
+  - cd C:\WORKSPACE\r
+  - git clone https://github.com/tianocore/edk2.git\r
+  - git clone https://github.com/tianocore/edk2-non-osi.git\r
+  \r
+    Note: The EDK II [Multiple Workspace](https://github.com/tianocore/tianocore.github.io/wiki/Multiple_Workspace)\r
+feature is used by this project.\r
+  \r
+* 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.\r
+\r
+## **Windows Build Instructions**\r
+\r
+### Pre-requisites Tools\r
+\r
+* Microsoft Visual Studio.\r
+  - Visual Studio 2015 recommended and is used in the examples below. Visual Studio 2013 is also supported.\r
+  \r
+* WINDDK\r
+  - Download Microsoft Windows Driver Development Kit 3790.1830 and install it to C:\WINDDK\3790.1830.\r
+  \r
+* Python 2.7\r
+  - Available from http://www.python.org. Install Python to C:\Python27, and add the path "C:\Python27" to system environment variable **PYTHON_HOME**.\r
+\r
+* Install iASL\r
+   - Install the iasl compiler by downloading iasl-win-20160527.zip from the following\r
+   location: "https://acpica.org/downloads/" and place the unzipped\r
+   content ("iasl.exe") into the directory "C:\ASL" on your local hard drive\r
+   (create the folder "C:\ASL" if it does not exist).\r
+\r
+* Install the NASM* assembly language compiler\r
+   - Download NASM* 2.12.02 binaries from \r
+   http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-win64.zip and place the\r
+   unzipped content ("nasm.exe") into the directory "C:\NASM" on your local hard drive\r
+   (create the folder "C:\NASM" if it does not exist). Add the path "C:\NASM\" to system environment variable **NASM_PREFIX**.\r
+\r
+* Install Openssl\r
+   - Download a pre-compiled Openssl Windows binary from \r
+   https://wiki.openssl.org/index.php/Binaries. Search for a Windows binary in the list \r
+   of "Third Party OpenSSL Related Binary Distributions". Go to the third party site to \r
+   download the latest version. Download and extract to C:\Openssl, add the path of openssl.exe \r
+   ("C:\openssl") to system environment variable **OPENSSL_PATH**.\r
+\r
+\r
+\r
+### Build Commands\r
+  * cd C:\WORKSPACE\edk2\Vlv2TbltDevicePkg\r
+\r
+  * To build 64-bit release version image: Build_IFWI.bat MNW2 Release\r
+\r
+  * To build 64-bit debug version image: Build_IFWI.bat MNW2 Debug\r
+  \r
+  * To build 32-bit release version image: Build_IFWI.bat /IA32 MNW2 Release\r
+\r
+  * To build 32-bit debug version image: Build_IFWI.bat /IA32 MNW2 Debug\r
+\r
+### Output\r
+* After the build process successfully completes, the 8MB firmware binary image will\r
+be located in the following location on your local hard drive:\r
+"C:\WORKSPACE\edk2\Vlv2TbltDevicePkg\Stitch\"\r
+\r
+\r
index 5f19983c9110ed2f3d6957e904b4a37cd3a6a395..934fef081cacc0b6c3536214c2deee1377e70b4c 100644 (file)
@@ -190,8 +190,8 @@ for %%i in (%BIOS_Names%) do (
     echo.\r
     echo Generating IFWI... %BIOS_ID%.bin\r
     echo.\r
-    \r
-    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\r
+\r
+    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\r
     echo.\r
     echo ===========================================================================\r
 )\r
index 27bc4e7c41be27ada7e373c295e0543bee8a3674..cd3ce41342a80741ec219710edc2cdf7b4622d51 100644 (file)
@@ -1,7 +1,7 @@
 @REM @file\r
 @REM   Windows batch file to build BIOS ROM\r
 @REM\r
-@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 @REM This program and the accompanying materials\r
 @REM are licensed and made available under the terms and conditions of the BSD License\r
 @REM which accompanies this distribution.  The full text of the license may be found at\r
@@ -17,38 +17,43 @@ echo.
 echo %date%  %time%\r
 echo.\r
 \r
+\r
 ::**********************************************************************\r
 :: Initial Setup\r
 ::**********************************************************************\r
-REM set WORKSPACE=%CD%\r
-REM if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%\r
+set WORKSPACE=%CD%\r
+if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%\r
 set /a build_threads=1\r
 set "Build_Flags= "\r
 set exitCode=0\r
 set Arch=X64\r
 set Source=0\r
+set CORE_PATH=%WORKSPACE%\edk2\r
+set PLATFORM_PATH=%WORKSPACE%\edk2\r
+set PACKAGES_PATH=%WORKSPACE%\edk2-non-osi\Silicon\Intel;%WORKSPACE%\edk2\r
+cd ./edk2\r
 \r
 :: Clean up previous build files.\r
-if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log\r
-if exist %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report del %WORKSPACE%\%PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report\r
-if exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log\r
-if exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt\r
-if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt\r
-if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt\r
-if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db\r
-if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache\r
+if exist %CORE_PATH%\edk2.log del %CORE_PATH%\edk2.log\r
+if exist %CORE_PATH%\unitool.log del %CORE_PATH%\unitool.log\r
+if exist %CORE_PATH%\Conf\target.txt del %CORE_PATH%\Conf\target.txt\r
+if exist %CORE_PATH%\Conf\tools_def.txt del %CORE_PATH%\Conf\tools_def.txt\r
+if exist %CORE_PATH%\Conf\build_rule.txt del %CORE_PATH%\Conf\build_rule.txt\r
+if exist %CORE_PATH%\Conf\FrameworkDatabase.db del %CORE_PATH%\Conf\FrameworkDatabase.db\r
+if exist conf\.cache rmdir /q/s conf\.cache\r
 \r
 :: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf\r
 :: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding\r
-call edksetup.bat > nul\r
+call %CORE_PATH%\edksetup.bat Rebuild\r
 @echo off\r
 \r
 :: Define platform specific environment variables.\r
-set PLATFORM_PACKAGE=Vlv2TbltDevicePkg\r
-set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc\r
-set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt\r
+set PLATFORM_NAME=Vlv2TbltDevicePkg\r
+set PLATFORM_PACKAGE=%PLATFORM_PATH%\Vlv2TbltDevicePkg\r
+set config_file=%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc\r
+set auto_config_inc=%PLATFORM_PACKAGE%\AutoPlatformCFG.txt\r
+\r
 \r
-REM set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg\r
 \r
 ::create new AutoPlatformCFG.txt file\r
 copy /y nul %auto_config_inc% >nul\r
@@ -62,7 +67,7 @@ copy /y nul %auto_config_inc% >nul
 if /i "%~1"=="/?" goto Usage\r
 \r
 if /i "%~1"=="/l" (\r
-    set Build_Flags=%Build_Flags% -j %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.log\r
+    set Build_Flags=%Build_Flags% -j EDK2.log\r
     shift\r
     goto OptLoop\r
 )\r
@@ -109,17 +114,17 @@ if "%~1"=="" goto Usage
 \r
 ::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\\r
 if "%Arch%"=="IA32" (\r
-    findstr /b /v "BOARD_ID  BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > %WORKSPACE%\Conf\BiosId.env\r
+    findstr /b /v "BOARD_ID  BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > Conf\BiosId.env\r
     echo DEFINE X64_CONFIG = FALSE  >> %auto_config_inc%\r
 ) else if "%Arch%"=="X64" (\r
-    findstr /b /v "BOARD_ID  BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > %WORKSPACE%\Conf\BiosId.env\r
+    findstr /b /v "BOARD_ID  BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > Conf\BiosId.env\r
     echo DEFINE X64_CONFIG = TRUE  >> %auto_config_inc%\r
 )\r
 \r
 :: -- Build flags settings for each Platform --\r
 echo Setting  %1  platform configuration and BIOS ID...\r
 if /i "%~1" == "MNW2" (\r
-    echo BOARD_ID = MNW2MAX >> %WORKSPACE%\Conf\BiosId.env\r
+    echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env\r
     echo DEFINE ENBDT_PF_BUILD = TRUE   >> %auto_config_inc%\r
     \r
 ) else (\r
@@ -130,24 +135,24 @@ set Platform_Type=%~1
 \r
 if /i "%~2" == "RELEASE" (\r
     set target=RELEASE\r
-    echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env\r
+    echo BUILD_TYPE = R >> Conf\BiosId.env\r
 ) else (\r
     set target=DEBUG\r
-    echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env\r
+    echo BUILD_TYPE = D >> Conf\BiosId.env\r
 )\r
 \r
 ::**********************************************************************\r
 :: Additional EDK Build Setup/Configuration\r
 ::**********************************************************************\r
 echo.\r
-echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...\r
+echo Setting the Build environment for VS2015/VS2013/VS2012/VS2010/VS2008...\r
 if defined VS140COMNTOOLS (\r
   if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat"\r
   if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" (\r
     set TOOL_CHAIN_TAG=VS2015\r
   ) else (\r
     set TOOL_CHAIN_TAG=VS2015x86\r
-  )\r
+  ) \r
 ) else if defined VS120COMNTOOLS (\r
   if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"\r
   if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (\r
@@ -177,34 +182,34 @@ if defined VS140COMNTOOLS (
      set TOOL_CHAIN_TAG=VS2008x86\r
   )\r
 ) else (\r
-  echo  --ERROR: VS2008/VS2010/VS2012/VS2013/VS2015 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS/VS140COMMONTOOLS not defined ^^!\r
+  echo  --ERROR: VS2015/VS2013/VS2012/VS2010/VS2008 not installed correctly. VS140COMNTOOLS/VS120COMNTOOLS/VS110COMNTOOLS/VS100COMNTOOLS/VS90COMNTOOLS not defined ^^!\r
   echo.\r
   goto :BldFail\r
 )\r
 \r
 echo Ensuring correct build directory is present for GenBiosId...\r
-set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\r
+set BUILD_PATH=Build\%PLATFORM_NAME%\%TARGET%_%TOOL_CHAIN_TAG%\r
 \r
 echo Modifing Conf files for this build...\r
 :: Remove lines with these tags from target.txt\r
-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\r
+findstr /V "TARGET  TARGET_ARCH  TOOL_CHAIN_TAG  BUILD_RULE_CONF  ACTIVE_PLATFORM  MAX_CONCURRENT_THREAD_NUMBER" Conf\target.txt > Conf\target.txt.tmp\r
 \r
-echo TARGET          = %TARGET%                                  >> %WORKSPACE%\Conf\target.txt.tmp\r
+echo TARGET          = %TARGET%                                  >> Conf\target.txt.tmp\r
 if "%Arch%"=="IA32" (\r
-    echo TARGET_ARCH = IA32                                      >> %WORKSPACE%\Conf\target.txt.tmp\r
+    echo TARGET_ARCH = IA32                                       >> Conf\target.txt.tmp\r
 ) else if "%Arch%"=="X64" (\r
-    echo TARGET_ARCH = IA32 X64                                  >> %WORKSPACE%\Conf\target.txt.tmp\r
+    echo TARGET_ARCH = IA32 X64                                  >> Conf\target.txt.tmp\r
 )\r
-echo TOOL_CHAIN_TAG  = %TOOL_CHAIN_TAG%                                  >> %WORKSPACE%\Conf\target.txt.tmp\r
-echo BUILD_RULE_CONF = Conf/build_rule.txt                               >> %WORKSPACE%\Conf\target.txt.tmp\r
+echo TOOL_CHAIN_TAG  = %TOOL_CHAIN_TAG%                                  >> Conf\target.txt.tmp\r
+echo BUILD_RULE_CONF = Conf/build_rule.txt                               >> Conf\target.txt.tmp\r
 if %Source% == 0 (\r
-  echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc        >> %WORKSPACE%\Conf\target.txt.tmp\r
+  echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc        >> Conf\target.txt.tmp\r
 ) else (\r
-  echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc  >> %WORKSPACE%\Conf\target.txt.tmp\r
+  echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc  >> Conf\target.txt.tmp\r
 )\r
-echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads%                      >> %WORKSPACE%\Conf\target.txt.tmp\r
+echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads%                      >> Conf\target.txt.tmp\r
 \r
-move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul\r
+move /Y Conf\target.txt.tmp Conf\target.txt >nul\r
 \r
 ::**********************************************************************\r
 :: Build BIOS\r
@@ -212,11 +217,11 @@ move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul
 \r
 echo Creating BiosId...\r
 pushd %PLATFORM_PACKAGE%\r
-if not exist %BUILD_PATH%\IA32  mkdir %BUILD_PATH%\IA32\r
-  GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat\r
+if not exist %WORKSPACE%\%BUILD_PATH%\IA32  mkdir %WORKSPACE%\%BUILD_PATH%\IA32\r
+  GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\IA32\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat\r
 if "%Arch%"=="X64" (\r
-   if not exist %BUILD_PATH%\X64  mkdir %BUILD_PATH%\X64\r
-   GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat\r
+   if not exist %WORKSPACE%\%BUILD_PATH%\X64  mkdir %WORKSPACE%\%BUILD_PATH%\X64\r
+   GenBiosId.exe -i %CORE_PATH%\Conf\BiosId.env -o %WORKSPACE%\%BUILD_PATH%\X64\BiosId.bin -ob %CORE_PATH%\Conf\BiosId.bat\r
 )\r
 popd\r
 \r
@@ -237,24 +242,23 @@ echo Running fce...
 \r
 pushd %PLATFORM_PACKAGE%\r
 :: Extract Hii data from build and store in HiiDefaultData.txt\r
-fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\HiiDefaultData.txt\r
+fce read -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd > %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt\r
 \r
 :: save changes to VlvXXX.fd\r
-fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV\HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd\r
-\r
+fce update -i %WORKSPACE%\%BUILD_PATH%\FV\Vlv.fd -s %WORKSPACE%\%BUILD_PATH%\FV\HiiDefaultData.txt -o %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd\r
 popd\r
 \r
 if %ERRORLEVEL% NEQ 0 goto BldFail\r
 ::echo FD successfully updated with default Hii values.\r
 \r
 :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings\r
+find /v "#" Conf\BiosId.env > ver_strings\r
 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j\r
 del /f/q ver_strings >nul\r
 \r
 set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
-copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd  %WORKSPACE%\%BIOS_Name% >nul\r
-copy /y/b %BUILD_PATH%\FV\Vlv%Arch%.fd  %BUILD_PATH%\FV\Vlv.ROM >nul\r
+copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd  %PLATFORM_PATH%\%BIOS_Name% >nul\r
+copy /y/b %WORKSPACE%\%BUILD_PATH%\FV\Vlv%Arch%.fd  %WORKSPACE%\%BUILD_PATH%\FV\Vlv.ROM >nul\r
 \r
 echo.\r
 echo Build location:     %BUILD_PATH%\r
@@ -264,13 +268,13 @@ echo -------------------- The EDKII BIOS build has successfully completed. -----
 echo.\r
 \r
 @REM build capsule here\r
-if "%openssl_path%" == "" (\r
-    echo -- Error:  OPENSSL_PATH not set.  Capule and Recovery images not generated.\r
-    set exitCode=1\r
-    goto Exit\r
-)\r
-echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv\r
-build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc\r
+@REMif "%openssl_path%" == "" (\r
+@REM    echo -- Error:  OPENSSL_PATH not set.  Capule and Recovery images not generated.\r
+@REM    set exitCode=1\r
+@REM    goto Exit\r
+@REM\r
+@REM echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv\r
+@REM build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc\r
 \r
 goto Exit\r
 \r