Vlv2TbltDevicePkg: Sync the branch changes to Trunk,

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

diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index ac387c647a11bc88033359277192b4c5aa1c0984..2ff14ec6bb5daf5251da3a743adbfef8f879af86 100644 (file)
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>\r

                                                                                    \r
 \r
   This program and the accompanying materials are licensed and made available under\r
                                                                                    \r
 \r
   This program and the accompanying materials are licensed and made available under\r

diff --git a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
index 709cdc76ce98dde742b5a78984354a9cdfaa4417..16629bf93bf31262021968a038337f074917326a 100644 (file)
--- a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
+++ b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2007  - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007  - 2015, 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
                                                                                    \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


@@ -25,8 +25,8 @@ EFI_HII_HANDLE  HiiHandle;
 //00000000     007FFFFF        00800000        Flash Image\r
 //\r
 //00000000     00000FFF        00001000        Descriptor Region\r
 //00000000     007FFFFF        00800000        Flash Image\r
 //\r
 //00000000     00000FFF        00001000        Descriptor Region\r

-//00001000     004FFFFF        004FF000        TXE Region\r
-//00500000     007FFFFF        00300000        BIOS Region\r
+//00001000     003FFFFF        003FF000        TXE Region\r
+//00500000     007FFFFF        00400000        BIOS Region\r

 //\r
 FV_REGION_INFO mRegionInfo[] = {\r
   {FixedPcdGet32 (PcdFlashDescriptorBase), FixedPcdGet32 (PcdFlashDescriptorSize), TRUE},\r
 //\r
 FV_REGION_INFO mRegionInfo[] = {\r
   {FixedPcdGet32 (PcdFlashDescriptorBase), FixedPcdGet32 (PcdFlashDescriptorSize), TRUE},\r

diff --git a/Vlv2TbltDevicePkg/BiosIdD.env b/Vlv2TbltDevicePkg/BiosIdD.env
index 8ef622e88e2d1867f72338ea27f46e2042074d2f..bbed4e1b7e8a105eb2be2081c8380d81ec6314a6 100644 (file)
--- a/Vlv2TbltDevicePkg/BiosIdD.env
+++ b/Vlv2TbltDevicePkg/BiosIdD.env
@@ -26,5 +26,5 @@ OEM_ID        = I32
 BUILD_TYPE    = D\r
 \r
 BOARD_ID = BLAKCRB\r
 BUILD_TYPE    = D\r
 \r
 BOARD_ID = BLAKCRB\r

-VERSION_MAJOR = 0083\r
+VERSION_MAJOR = 0084\r

 VERSION_MINOR = 01\r
 VERSION_MINOR = 01\r

diff --git a/Vlv2TbltDevicePkg/BiosIdR.env b/Vlv2TbltDevicePkg/BiosIdR.env
index 2ddafe2ea499d7f0a1546eaee89a1ea8dba147fb..f968380ba4ecf0f18559d3ad2c0c9474744fd7f3 100644 (file)
--- a/Vlv2TbltDevicePkg/BiosIdR.env
+++ b/Vlv2TbltDevicePkg/BiosIdR.env
@@ -26,5 +26,5 @@ OEM_ID        = I32
 BUILD_TYPE    = R\r
 \r
 BOARD_ID = BLAKCRB\r
 BUILD_TYPE    = R\r
 \r
 BOARD_ID = BLAKCRB\r

-VERSION_MAJOR = 0083\r
+VERSION_MAJOR = 0084\r

 VERSION_MINOR = 01\r
 VERSION_MINOR = 01\r

diff --git a/Vlv2TbltDevicePkg/BiosIdx64D.env b/Vlv2TbltDevicePkg/BiosIdx64D.env
index 564e15f2ccb462be6962b9e4701ae5efc5f33e0f..c9a90efe9812fc5d1f84a4b743598095ff4e8fc3 100644 (file)
--- a/Vlv2TbltDevicePkg/BiosIdx64D.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64D.env
@@ -25,6 +25,6 @@ BOARD_REV     = 1
 OEM_ID        = X64\r
 BUILD_TYPE    = D\r
 \r
 OEM_ID        = X64\r
 BUILD_TYPE    = D\r
 \r

-VERSION_MAJOR = 0083\r
+VERSION_MAJOR = 0084\r

 VERSION_MINOR = 01\r
 BOARD_ID = BBAYCRB \r
 VERSION_MINOR = 01\r
 BOARD_ID = BBAYCRB \r

diff --git a/Vlv2TbltDevicePkg/BiosIdx64R.env b/Vlv2TbltDevicePkg/BiosIdx64R.env
index d72dec5409823b71ef7e721e655e01f5daae632e..b350468a390f24cc7b9a17bed6afb988c2eaf3b4 100644 (file)
--- a/Vlv2TbltDevicePkg/BiosIdx64R.env
+++ b/Vlv2TbltDevicePkg/BiosIdx64R.env
@@ -25,6 +25,6 @@ BOARD_REV     = 1
 OEM_ID        = X64\r
 BUILD_TYPE    = R\r
 \r
 OEM_ID        = X64\r
 BUILD_TYPE    = R\r
 \r

-VERSION_MAJOR = 0083\r
+VERSION_MAJOR = 0084\r

 VERSION_MINOR = 01\r
 BOARD_ID = BBAYCRB \r
 VERSION_MINOR = 01\r
 BOARD_ID = BBAYCRB \r

diff --git a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
index e0de86d2f517011fc5dd76f7645be8a204098abb..5e650b69a244e05628a033bf8c68ce303984c695 100644 (file)
--- a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
@@ -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

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.dec b/Vlv2TbltDevicePkg/PlatformPkg.dec
index 378cb530d21ac205c52e066f95c81e04b5a61c27..c5e0d24b9db8624ce7a3ed48e5f399855d25da14 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.dec
+++ b/Vlv2TbltDevicePkg/PlatformPkg.dec
@@ -2,7 +2,7 @@
 # Platform Package\r
 #\r
 # This package provides platform specific modules.\r
 # Platform Package\r
 #\r
 # This package provides platform specific modules.\r

-# Copyright (c) 2009  - 2014, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2009  - 2015, 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
 #                                                                                  \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


@@ -152,9 +152,9 @@
   gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase|0xFF800000|UINT32|0x40000003\r
   gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize|0x00001000|UINT32|0x40000004\r
   gPlatformModuleTokenSpaceGuid.PcdTxeRomBase|0xFF801000|UINT32|0x40000009\r
   gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase|0xFF800000|UINT32|0x40000003\r
   gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize|0x00001000|UINT32|0x40000004\r
   gPlatformModuleTokenSpaceGuid.PcdTxeRomBase|0xFF801000|UINT32|0x40000009\r

-  gPlatformModuleTokenSpaceGuid.PcdTxeRomSize|0x004FF000|UINT32|0x4000000A\r
-  gPlatformModuleTokenSpaceGuid.PcdBiosRomBase|0xFFD00000|UINT32|0x4000000B\r
-  gPlatformModuleTokenSpaceGuid.PcdBiosRomSize|0x00300000|UINT32|0x4000000C\r
+  gPlatformModuleTokenSpaceGuid.PcdTxeRomSize|0x003FF000|UINT32|0x4000000A\r
+  gPlatformModuleTokenSpaceGuid.PcdBiosRomBase|0xFFC00000|UINT32|0x4000000B\r
+  gPlatformModuleTokenSpaceGuid.PcdBiosRomSize|0x00400000|UINT32|0x4000000C\r

 \r
 [PcdsFeatureFlag]\r
   ## This PCD specifies whether StatusCode is reported via ISA Serial port.\r
 \r
 [PcdsFeatureFlag]\r
   ## This PCD specifies whether StatusCode is reported via ISA Serial port.\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 03cabb9084a00e27b2faa4a8d1b10e927569a9f2..53d9dd4ba8da4d760d10451199cfa5969107bd8a 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -15,45 +15,45 @@
 #**/
 
 [Defines]
 #**/
 
 [Defines]

-DEFINE FLASH_BASE       = 0xFFD00000     #The base address of the 3Mb FLASH Device.
-DEFINE FLASH_SIZE       = 0x00300000     #The flash size in bytes of the 3Mb FLASH Device.
-DEFINE FLASH_BLOCK_SIZE = 0x1000        #The block size in bytes of the 3Mb FLASH Device.
-DEFINE FLASH_NUM_BLOCKS = 0x300           #The number of blocks in 3Mb FLASH Device.
+DEFINE FLASH_BASE       = 0xFFC00000     #The base address of the 4Mb 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 4Mb FLASH Device.
+DEFINE FLASH_NUM_BLOCKS = 0x400           #The number of blocks in 4Mb FLASH Device.

 DEFINE FLASH_AREA_BASE_ADDRESS                                = 0xFF800000
 DEFINE FLASH_AREA_SIZE                                        = 0x00800000
 
 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00000000 
 DEFINE FLASH_AREA_BASE_ADDRESS                                = 0xFF800000
 DEFINE FLASH_AREA_SIZE                                        = 0x00800000
 
 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00000000 

-DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00030000
-DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFD00000
+DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00040000
+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
 
 !if $(MINNOW2_FSP_BUILD) == TRUE
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000
 
 !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_BASE                               = 0xFFDB0000
 
 DEFINE FLASH_REGION_FSPBIN_SIZE                               = 0x00048000
 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_BASE                            = 0xFFDF8000
 
 !endif
 
 DEFINE FLASH_REGION_AZALIABIN_SIZE                            = 0x00008000
 DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFDF8000
 
 !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
 
 ################################################################################

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 9ec4ce5c392e3682ce4e72eb972599928dd76f77..d26530c431e05ab851012cc55a85bedb642dfdb8 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -15,46 +15,45 @@
 #**/
 
 [Defines]
 #**/
 
 [Defines]

-DEFINE FLASH_BASE       = 0xFFD00000     #The base address of the 3Mb FLASH Device.
-DEFINE FLASH_SIZE       = 0x00300000     #The flash size in bytes of the 3Mb FLASH Device.
-DEFINE FLASH_BLOCK_SIZE = 0x1000        #The block size in bytes of the 3Mb FLASH Device.
-DEFINE FLASH_NUM_BLOCKS = 0x300           #The number of blocks in 3Mb FLASH Device.
+DEFINE FLASH_BASE       = 0xFFC00000     #The base address of the 4Mb 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 4Mb FLASH Device.
+DEFINE FLASH_NUM_BLOCKS = 0x400           #The number of blocks in 4Mb FLASH Device.

 DEFINE FLASH_AREA_BASE_ADDRESS                                = 0xFF800000
 DEFINE FLASH_AREA_SIZE                                        = 0x00800000
 
 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00000000 
 DEFINE FLASH_AREA_BASE_ADDRESS                                = 0xFF800000
 DEFINE FLASH_AREA_SIZE                                        = 0x00800000
 
 DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00000000 

-DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00030000
-DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFD00000
+DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00040000
+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
 
 !if $(MINNOW2_FSP_BUILD) == TRUE
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000
 
 !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_BASE                               = 0xFFDB0000
 
 DEFINE FLASH_REGION_FSPBIN_SIZE                               = 0x00048000
 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_BASE                            = 0xFFDF8000
 
 !endif
 
 DEFINE FLASH_REGION_AZALIABIN_SIZE                            = 0x00008000
 DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFDF8000
 
 !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                       = 0x00296000
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00396000

 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
 
 ################################################################################

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 5c0b68a5e6a0c8481b62f578e3c5ca43d4c537a7..a2a5b026bf1fc5afcfe0532987caa44cda8a88e4 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -604,9 +604,9 @@
 [PcdsFixedAtBuild.common]
 !if $(MINNOW2_FSP_BUILD) == TRUE
 # $(FLASH_REGION_VLVMICROCODE_BASE)
 [PcdsFixedAtBuild.common]
 !if $(MINNOW2_FSP_BUILD) == TRUE
 # $(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
 # $(FLASH_AREA_BASE_ADDRESS)
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000
   gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
 # $(FLASH_AREA_BASE_ADDRESS)
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index dad2eb0d05d3fe96af83572a9fab1dc877022b73..f42995b362032a49b97b2c41eda44d089c4e8c7a 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -604,9 +604,9 @@
 [PcdsFixedAtBuild.common]
 !if $(MINNOW2_FSP_BUILD) == TRUE
 # $(FLASH_REGION_VLVMICROCODE_BASE)
 [PcdsFixedAtBuild.common]
 !if $(MINNOW2_FSP_BUILD) == TRUE
 # $(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
 # $(FLASH_AREA_BASE_ADDRESS)
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000
   gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
 # $(FLASH_AREA_BASE_ADDRESS)
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index e32092ebabda4f2fe7f26ec9c3f234dbe6a5da47..e2bba6572283fddbbad4f1d940b18dec978dbeaf 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -604,9 +604,9 @@
 [PcdsFixedAtBuild.common]
 !if $(MINNOW2_FSP_BUILD) == TRUE
 # $(FLASH_REGION_VLVMICROCODE_BASE)
 [PcdsFixedAtBuild.common]
 !if $(MINNOW2_FSP_BUILD) == TRUE
 # $(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
 # $(FLASH_AREA_BASE_ADDRESS)
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000
   gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60
 # $(FLASH_AREA_BASE_ADDRESS)
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
index 18a29ed562ed4c311d5195477018cc59d2334e47..58e2676c4425e7808be52a6148f65bef10cb9919 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
@@ -1,6 +1,6 @@
 //\r
 //\r
 //\r
 //\r

-// Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>\r
+// Copyright (c) 2004  - 2015, 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
 //                                                                                  \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

diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin
index 5c26f1ed01e86d78b04087b037932a86b08a53bc..ca10f7af61b91e1daf79e374c6c837ee06e6ea4c 100644 (file)
Binary files a/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin and b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER.bin differ

diff --git a/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin
index f32b1df394cc8a2ff24d72cf5c2a363f2ab6c441..f2dcb0067d1a48f08b4c4048362443b5c7095aa9 100644 (file)
Binary files a/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin and b/Vlv2TbltDevicePkg/Stitch/IFWIHeader/IFWI_HEADER_SPILOCK.bin differ

diff --git a/Vlv2TbltDevicePkg/Stitch/MNW2_Stitch_Config.txt b/Vlv2TbltDevicePkg/Stitch/MNW2_Stitch_Config.txt
index 707fbba96356e8f5705ca5bd4ac08aa9420f25c3..5a0a2b4911ab6ca0d1b02ccf620388a4ac3fa953 100644 (file)
--- a/Vlv2TbltDevicePkg/Stitch/MNW2_Stitch_Config.txt
+++ b/Vlv2TbltDevicePkg/Stitch/MNW2_Stitch_Config.txt
@@ -12,5 +12,5 @@
 #\r
 \r
 HEADER=IFWI_HEADER\r
 #\r
 \r
 HEADER=IFWI_HEADER\r

-SEC_VERSION=1.0.2.1067\r
+SEC_VERSION=1.0.2.1060v5\r

 \r
 \r

diff --git a/Vlv2TbltDevicePkg/bld_vlv.sh b/Vlv2TbltDevicePkg/bld_vlv.sh
index 5b2ea3fa0fb8a1aa57645ab8667036bca5f1ba72..569865fbd9a4a26c44db32033863b1a93a1b3d5d 100755 (executable)
--- a/Vlv2TbltDevicePkg/bld_vlv.sh
+++ b/Vlv2TbltDevicePkg/bld_vlv.sh
@@ -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_ID="$BOARD_ID"_"$Arch"_"$BUILD_TYPE"_"$VERSION_MAJOR"_"$VERSION_MINOR"_GCC.bin
 cp -f $BUILD_PATH/FV/VLV.fd  $WORKSPACE/$BIOS_Name
 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
 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