sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vlv2TbltDevicePkg: Sync the branch changes to Trunk,

Browse Source 
Add Microcode, and Change Flash size from 3M to 4M.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Shifei Lu <shifeix.a.lu@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18780 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Shifei Lu
2015-11-13 02:38:08 +00:00
committed by timhe
parent 0c9a522f28
commit 9ea2d90187
18 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
View File

@@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under This program and the accompanying materials are licensed and made available under

6
Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
View File

@@ -1,6 +1,6 @@
/** @file /** @file
Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under This program and the accompanying materials are licensed and made available under
@@ -25,8 +25,8 @@ EFI_HII_HANDLE HiiHandle;
#include "FirmwareUpdate.h" #include "FirmwareUpdate.h"
EFI_HII_HANDLE HiiHandle; EFI_HII_HANDLE HiiHandle;
// //
// MinnowMax Flash Layout // MinnowMax Flash Layout
// //
//Start (hex) End (hex) Length (hex) Area Name //Start (hex) End (hex) Length (hex) Area Name

2
Vlv2TbltDevicePkg/BiosIdD.env
View File

@@ -26,5 +26,5 @@ OEM_ID = I32
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #

2
Vlv2TbltDevicePkg/BiosIdR.env
View File

@@ -26,5 +26,5 @@ OEM_ID = I32
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #

2
Vlv2TbltDevicePkg/BiosIdx64D.env
View File

@@ -25,6 +25,6 @@ BOARD_REV = 1
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #

2
Vlv2TbltDevicePkg/BiosIdx64R.env
View File

@@ -25,6 +25,6 @@ BOARD_REV = 1
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
# #
# #

2
Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
View File

@@ -1,6 +1,6 @@
/*++ /*++
Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under This program and the accompanying materials are licensed and made available under

8
Vlv2TbltDevicePkg/PlatformPkg.dec
View File

@@ -2,7 +2,7 @@
# Platform Package # Platform Package
# #
# This package provides platform specific modules. # This package provides platform specific modules.
# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials are licensed and made available under # This program and the accompanying materials are licensed and made available under
@@ -152,9 +152,9 @@
gPlatformModuleTokenSpaceGuid.PcdRamLogBaseAddress|0x20000|UINT32|0x00000013 gPlatformModuleTokenSpaceGuid.PcdRamLogBaseAddress|0x20000|UINT32|0x00000013
gPlatformModuleTokenSpaceGuid.PcdRamLogBaseLength|0x80000|UINT32|0x00000014 gPlatformModuleTokenSpaceGuid.PcdRamLogBaseLength|0x80000|UINT32|0x00000014
gPlatformModuleTokenSpaceGuid.PcdRamLogBaseCarAddress|0xFEF86000|UINT32|0x00000015 gPlatformModuleTokenSpaceGuid.PcdRamLogBaseCarAddress|0xFEF86000|UINT32|0x00000015
gPlatformModuleTokenSpaceGuid.PcdRamLogBaseCarLength|0x2000|UINT32|0x00000016 gPlatformModuleTokenSpaceGuid.PcdRamLogBaseCarLength|0x2000|UINT32|0x00000016
#Pcd for Flash Update tool #Pcd for Flash Update tool
gPlatformModuleTokenSpaceGuid.PcdFlashChipBase|0xFF800000|UINT32|0x40000001 gPlatformModuleTokenSpaceGuid.PcdFlashChipBase|0xFF800000|UINT32|0x40000001
gPlatformModuleTokenSpaceGuid.PcdFlashChipSize|0x00800000|UINT32|0x40000002 gPlatformModuleTokenSpaceGuid.PcdFlashChipSize|0x00800000|UINT32|0x40000002

28
Vlv2TbltDevicePkg/PlatformPkg.fdf
View File

@@ -15,45 +15,45 @@
#**/ #**/
[Defines] [Defines]
DEFINE FLASH_BASE = 0xFFD00000 #The base address of the 3Mb FLASH Device. DEFINE FLASH_BASE = 0xFFC00000 #The base address of the 4Mb FLASH Device.
DEFINE FLASH_SIZE = 0x00300000 #The flash size in bytes of the 3Mb FLASH Device. DEFINE FLASH_SIZE = 0x00400000 #The flash size in bytes of the 4Mb FLASH Device.
DEFINE FLASH_BLOCK_SIZE = 0x1000 #The block size in bytes of the 3Mb FLASH Device. DEFINE FLASH_BLOCK_SIZE = 0x1000 #The block size in bytes of the 4Mb FLASH Device.
DEFINE FLASH_NUM_BLOCKS = 0x300 #The number of blocks in 3Mb FLASH Device. DEFINE FLASH_NUM_BLOCKS = 0x400 #The number of blocks in 4Mb FLASH Device.
DEFINE FLASH_AREA_BASE_ADDRESS = 0xFF800000 DEFINE FLASH_AREA_BASE_ADDRESS = 0xFF800000
DEFINE FLASH_AREA_SIZE = 0x00800000 DEFINE FLASH_AREA_SIZE = 0x00800000
DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000
DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000 DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00040000
DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFD00000 DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFC00000
DEFINE FLASH_REGION_VPD_OFFSET = 0x00030000 DEFINE FLASH_REGION_VPD_OFFSET = 0x00130000
DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000 DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0006E000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00070000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00170000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x000B0000 DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000
DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000 DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000
DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000 DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000
DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x000F8000 DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x001F8000
DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000 DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000
DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000 DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000
!endif !endif
DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00100000 DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000
DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001A5000 DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001A5000
DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x002A5000 DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x003A5000
DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002B000 DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002B000
DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002D0000 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003D0000
DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00030000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00030000
################################################################################ ################################################################################

29
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
View File

@@ -15,46 +15,45 @@
#**/ #**/
[Defines] [Defines]
DEFINE FLASH_BASE = 0xFFD00000 #The base address of the 3Mb FLASH Device. DEFINE FLASH_BASE = 0xFFC00000 #The base address of the 4Mb FLASH Device.
DEFINE FLASH_SIZE = 0x00300000 #The flash size in bytes of the 3Mb FLASH Device. DEFINE FLASH_SIZE = 0x00400000 #The flash size in bytes of the 4Mb FLASH Device.
DEFINE FLASH_BLOCK_SIZE = 0x1000 #The block size in bytes of the 3Mb FLASH Device. DEFINE FLASH_BLOCK_SIZE = 0x1000 #The block size in bytes of the 4Mb FLASH Device.
DEFINE FLASH_NUM_BLOCKS = 0x300 #The number of blocks in 3Mb FLASH Device. DEFINE FLASH_NUM_BLOCKS = 0x400 #The number of blocks in 4Mb FLASH Device.
DEFINE FLASH_AREA_BASE_ADDRESS = 0xFF800000 DEFINE FLASH_AREA_BASE_ADDRESS = 0xFF800000
DEFINE FLASH_AREA_SIZE = 0x00800000 DEFINE FLASH_AREA_SIZE = 0x00800000
DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000
DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00030000 DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00040000
DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFD00000 DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFC00000
DEFINE FLASH_REGION_VPD_OFFSET = 0x00030000 DEFINE FLASH_REGION_VPD_OFFSET = 0x00130000
DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000 DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0006E000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00070000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00170000
DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x000B0000 DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000
DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000 DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000
DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000 DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000
DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x000F8000 DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x001F8000
DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000 DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000
DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000 DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000
!endif !endif
DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00100000 DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000
DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00196000 DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00196000
DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00396000
DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00296000
DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002C000 DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002C000
DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x002C2000 DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003C2000
DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003E000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003E000
################################################################################ ################################################################################

4
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
View File

@@ -604,9 +604,9 @@
[PcdsFixedAtBuild.common] [PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE) # $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFD00000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000
# $(FLASH_REGION_VLVMICROCODE_SIZE) # $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
# $(FLASH_AREA_BASE_ADDRESS) # $(FLASH_AREA_BASE_ADDRESS)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000

4
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
View File

@@ -604,9 +604,9 @@
[PcdsFixedAtBuild.common] [PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE) # $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFD00000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000
# $(FLASH_REGION_VLVMICROCODE_SIZE) # $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
# $(FLASH_AREA_BASE_ADDRESS) # $(FLASH_AREA_BASE_ADDRESS)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000

4
Vlv2TbltDevicePkg/PlatformPkgX64.dsc
View File

@@ -604,9 +604,9 @@
[PcdsFixedAtBuild.common] [PcdsFixedAtBuild.common]
!if $(MINNOW2_FSP_BUILD) == TRUE !if $(MINNOW2_FSP_BUILD) == TRUE
# $(FLASH_REGION_VLVMICROCODE_BASE) # $(FLASH_REGION_VLVMICROCODE_BASE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFD00000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000
# $(FLASH_REGION_VLVMICROCODE_SIZE) # $(FLASH_REGION_VLVMICROCODE_SIZE)
gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000
gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
# $(FLASH_AREA_BASE_ADDRESS) # $(FLASH_AREA_BASE_ADDRESS)
gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000

2
Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
View File

@@ -1,6 +1,6 @@
// //
// //
// Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR> // Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
// //
// This program and the accompanying materials are licensed and made available under // This program and the accompanying materials are licensed and made available under

BIN
Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin
View File

Binary file not shown.

BIN
Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin
View File

Binary file not shown.

2
Vlv2TbltDevicePkg/Stitch/MNW2_Stitch_Config.txt
View File

@@ -12,5 +12,5 @@
# #
HEADER=IFWI_HEADER HEADER=IFWI_HEADER
SEC_VERSION=1.0.2.1067 SEC_VERSION=1.0.2.1060v5

2
Vlv2TbltDevicePkg/bld_vlv.sh
View File

@@ -233,7 +233,7 @@ BOARD_ID=$(grep '^BOARD_ID' Conf/BiosId.env | cut -d ' ' -f 3 | cut -c 1-7)
BIOS_Name="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR".ROM BIOS_Name="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR".ROM
BIOS_ID="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR"_GCC.bin BIOS_ID="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR"_GCC.bin
cp -f $BUILD_PATH/FV/VLV.fd $WORKSPACE/$BIOS_Name cp -f $BUILD_PATH/FV/VLV.fd $WORKSPACE/$BIOS_Name
SEC_VERSION=1.0.2.1067 SEC_VERSION=1.0.2.1060v5
cat $IFWI_HEADER_FILE ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/VLV_SEC_REGION.bin ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/Vacant.bin $BIOS_Name > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID cat $IFWI_HEADER_FILE ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/VLV_SEC_REGION.bin ./Vlv2MiscBinariesPkg/SEC/$SEC_VERSION/Vacant.bin $BIOS_Name > ./$PLATFORM_PACKAGE/Stitch/$BIOS_ID