From 988715a3a788346205f66b37cc8414154ba282c0 Mon Sep 17 00:00:00 2001 From: lushifex <shifeix.a.lu@intel.com> Date: Wed, 8 Jun 2016 10:22:19 +0800 Subject: 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> --- Vlv2TbltDevicePkg/PlatformPkg.fdf | 26 +++++++++++++------------- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 26 +++++++++++++------------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 2 +- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index 929d6158c7..a49900668d 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -26,35 +26,35 @@ DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000 DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00040000 DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFC00000 -DEFINE FLASH_REGION_VPD_OFFSET = 0x00130000 +DEFINE FLASH_REGION_VPD_OFFSET = 0x00040000 DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000 -DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000 +DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0007E000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000 -DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00170000 +DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00080000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000 !if $(MINNOW2_FSP_BUILD) == TRUE -DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000 +DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x000C0000 DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000 -DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000 +DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFCC0000 -DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x001F8000 +DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x00108000 DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000 -DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000 +DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFD08000 !endif -DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000 -DEFINE FLASH_REGION_FVMAIN_SIZE = 0x001A5000 +DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00110000 +DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00210000 -DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x003A5000 -DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002B000 +DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00320000 +DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x00070000 -DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003D0000 -DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00030000 +DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x00390000 +DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00070000 ################################################################################ # diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index aa9c383bb9..72a0d2bfe8 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -26,35 +26,35 @@ DEFINE FLASH_REGION_VLVMICROCODE_OFFSET = 0x00000000 DEFINE FLASH_REGION_VLVMICROCODE_SIZE = 0x00040000 DEFINE FLASH_REGION_VLVMICROCODE_BASE = 0xFFC00000 -DEFINE FLASH_REGION_VPD_OFFSET = 0x00130000 +DEFINE FLASH_REGION_VPD_OFFSET = 0x00040000 DEFINE FLASH_REGION_VPD_SIZE = 0x0003E000 -DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0016E000 +DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_OFFSET = 0x0007E000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_WORKING_SIZE = 0x00002000 -DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00170000 +DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_OFFSET = 0x00080000 DEFINE FLASH_REGION_NVSTORAGE_SUBREGION_NV_FTW_SPARE_SIZE = 0x00040000 !if $(MINNOW2_FSP_BUILD) == TRUE -DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000 +DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x000C0000 DEFINE FLASH_REGION_FSPBIN_SIZE = 0x00048000 -DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFDB0000 +DEFINE FLASH_REGION_FSPBIN_BASE = 0xFFCC0000 -DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x001F8000 +DEFINE FLASH_REGION_AZALIABIN_OFFSET = 0x00108000 DEFINE FLASH_REGION_AZALIABIN_SIZE = 0x00008000 -DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFDF8000 +DEFINE FLASH_REGION_AZALIABIN_BASE = 0xFFD08000 !endif -DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000 -DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00196000 +DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00110000 +DEFINE FLASH_REGION_FVMAIN_SIZE = 0x00215000 -DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00396000 -DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0002C000 +DEFINE FLASH_REGION_FV_RECOVERY2_OFFSET = 0x00325000 +DEFINE FLASH_REGION_FV_RECOVERY2_SIZE = 0x0006B000 -DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003C2000 -DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003E000 +DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x00390000 +DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00070000 ################################################################################ # diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 7995bac946..ace2d73f46 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -614,7 +614,7 @@ # $(FLASH_AREA_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 # $(FLASH_REGION_FSPBIN_BASE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000 + gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000 !endif !if $(PERFORMANCE_ENABLE) == TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index 8c5a0fee52..9af90880a0 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -614,7 +614,7 @@ # $(FLASH_AREA_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 # $(FLASH_REGION_FSPBIN_BASE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000 + gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000 !endif !if $(PERFORMANCE_ENABLE) == TRUE diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index 4d7d834ac3..152bf671a3 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -614,7 +614,7 @@ # $(FLASH_AREA_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 # $(FLASH_REGION_FSPBIN_BASE) - gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFDB0000 + gFspWrapperTokenSpaceGuid.PcdFlashFvFspBase|0xFFCC0000 !endif !if $(PERFORMANCE_ENABLE) == TRUE -- cgit v1.2.3