Vlv2TbltDevicePkg:Change flash layout to fix the Fv space is not enough.

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

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 929d6158c77064e36ee312235a9b2b19844eb8e1..a49900668db0046cda2220a91b802cb064f1754b 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -26,35 +26,35 @@ DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00000000
 DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00040000\r
 DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFC00000\r
 \r
-DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00130000\r
+DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00040000\r
 DEFINE FLASH_REGION_VPD_SIZE                                  = 0x0003E000\r
 \r
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000\r
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0007E000\r
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE   = 0x00002000\r
 \r
 \r
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET   = 0x00170000\r
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET   = 0x00080000\r
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000\r
 \r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
-DEFINE FLASH_REGION_FSPBIN_OFFSET                             = 0x001B0000\r
+DEFINE FLASH_REGION_FSPBIN_OFFSET                             = 0x000C0000\r
 DEFINE FLASH_REGION_FSPBIN_SIZE                               = 0x00048000\r
-DEFINE FLASH_REGION_FSPBIN_BASE                               = 0xFFDB0000\r
+DEFINE FLASH_REGION_FSPBIN_BASE                               = 0xFFCC0000\r
 \r
-DEFINE FLASH_REGION_AZALIABIN_OFFSET                          = 0x001F8000\r
+DEFINE FLASH_REGION_AZALIABIN_OFFSET                          = 0x00108000\r
 DEFINE FLASH_REGION_AZALIABIN_SIZE                            = 0x00008000\r
-DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFDF8000\r
+DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFD08000\r
 \r
 !endif\r
 \r
-DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00200000\r
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x001A5000\r
+DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00110000\r
+DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00210000\r
 \r
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x003A5000\r
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002B000\r
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00320000\r
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x00070000\r
 \r
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x003D0000\r
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00030000\r
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x00390000\r
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00070000\r
 \r
 ################################################################################\r
 #\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index aa9c383bb9d3812f764be210a586afcffa3a7589..72a0d2bfe880d4eb8fd6a65c2d96ef943db075f5 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -26,35 +26,35 @@ DEFINE FLASH_REGION_VLVMICROCODE_OFFSET                       = 0x00000000
 DEFINE FLASH_REGION_VLVMICROCODE_SIZE                         = 0x00040000\r
 DEFINE FLASH_REGION_VLVMICROCODE_BASE                         = 0xFFC00000\r
 \r
-DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00130000\r
+DEFINE FLASH_REGION_VPD_OFFSET                                = 0x00040000\r
 DEFINE FLASH_REGION_VPD_SIZE                                  = 0x0003E000\r
 \r
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000\r
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0007E000\r
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE   = 0x00002000\r
 \r
 \r
-DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET   = 0x00170000\r
+DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET   = 0x00080000\r
 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE     = 0x00040000\r
 \r
 !if $(MINNOW2_FSP_BUILD) == TRUE\r
-DEFINE FLASH_REGION_FSPBIN_OFFSET                             = 0x001B0000\r
+DEFINE FLASH_REGION_FSPBIN_OFFSET                             = 0x000C0000\r
 DEFINE FLASH_REGION_FSPBIN_SIZE                               = 0x00048000\r
-DEFINE FLASH_REGION_FSPBIN_BASE                               = 0xFFDB0000\r
+DEFINE FLASH_REGION_FSPBIN_BASE                               = 0xFFCC0000\r
 \r
-DEFINE FLASH_REGION_AZALIABIN_OFFSET                          = 0x001F8000\r
+DEFINE FLASH_REGION_AZALIABIN_OFFSET                          = 0x00108000\r
 DEFINE FLASH_REGION_AZALIABIN_SIZE                            = 0x00008000\r
-DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFDF8000\r
+DEFINE FLASH_REGION_AZALIABIN_BASE                            = 0xFFD08000\r
 \r
 !endif\r
 \r
-DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00200000\r
-DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00196000\r
+DEFINE FLASH_REGION_FVMAIN_OFFSET                             = 0x00110000\r
+DEFINE FLASH_REGION_FVMAIN_SIZE                               = 0x00215000\r
 \r
-DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00396000\r
-DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0002C000\r
+DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET                       = 0x00325000\r
+DEFINE FLASH_REGION_FV_RECOVERY2_SIZE                         = 0x0006B000\r
 \r
-DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x003C2000\r
-DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x0003E000\r
+DEFINE FLASH_REGION_FV_RECOVERY_OFFSET                        = 0x00390000\r
+DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00070000\r
 \r
 ################################################################################\r
 #\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 7995bac946e3657cb45d82ec150a3482a5f65ef5..ace2d73f46abd05d449007ffde683c8002dba62e 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -614,7 +614,7 @@
 # $(FLASH_AREA_SIZE)\r
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000\r
 # $(FLASH_REGION_FSPBIN_BASE)\r
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000\r
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000\r
 !endif\r
 \r
 !if $(PERFORMANCE_ENABLE) == TRUE\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 8c5a0fee52134c9bce3434d029e286fd4d0830a1..9af90880a0e482fe14293a33a4bb8610c88daa15 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -614,7 +614,7 @@
 # $(FLASH_AREA_SIZE)\r
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000\r
 # $(FLASH_REGION_FSPBIN_BASE)\r
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000\r
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000\r
 !endif\r
 \r
 !if $(PERFORMANCE_ENABLE) == TRUE\r

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 4d7d834ac36f73ee4b1425f8c3bf58c16686497a..152bf671a36b3d40cf7f0b77b03e16b320f23afa 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -614,7 +614,7 @@
 # $(FLASH_AREA_SIZE)\r
   gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000\r
 # $(FLASH_REGION_FSPBIN_BASE)\r
-  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000\r
+  gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000\r
 !endif\r
 \r
 !if $(PERFORMANCE_ENABLE) == TRUE\r