Reviewed-by: David Wei <[email protected]> Thanks, David | SSG BIOS
-----Original Message----- From: edk2-devel [mailto:[email protected]] On Behalf Of lushifex Sent: Wednesday, November 11, 2015 4:27 PM To: [email protected] Subject: [edk2] [Patch] Change BIOS Flash size from 3M to 4M. Signed-off-by: lushifex <[email protected]> --- .../Application/FirmwareUpdate/FirmwareUpdate.c | 6 ++--- Vlv2TbltDevicePkg/PlatformPkg.dec | 8 +++--- Vlv2TbltDevicePkg/PlatformPkg.fdf | 28 +++++++++---------- Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 31 +++++++++++----------- Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 4 +-- Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 4 +-- Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 4 +-- 7 files changed, 42 insertions(+), 43 deletions(-) diff --git a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c index 709cdc7..16629bf 100644 --- a/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c +++ b/Vlv2TbltDevicePkg/Application/FirmwareUpdate/FirmwareUpdate.c @@ -1,8 +1,8 @@ /** @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 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. @@ -23,12 +23,12 @@ EFI_HII_HANDLE HiiHandle; //Start (hex) End (hex) Length (hex) Area Name //----------- --------- ------------ --------- //00000000 007FFFFF 00800000 Flash Image // //00000000 00000FFF 00001000 Descriptor Region -//00001000 004FFFFF 004FF000 TXE Region -//00500000 007FFFFF 00300000 BIOS Region +//00001000 003FFFFF 003FF000 TXE Region +//00500000 007FFFFF 00400000 BIOS Region // FV_REGION_INFO mRegionInfo[] = { {FixedPcdGet32 (PcdFlashDescriptorBase), FixedPcdGet32 (PcdFlashDescriptorSize), TRUE}, {FixedPcdGet32 (PcdTxeRomBase), FixedPcdGet32 (PcdTxeRomSize), TRUE}, {FixedPcdGet32 (PcdBiosRomBase), FixedPcdGet32 (PcdBiosRomSize), TRUE} diff --git a/Vlv2TbltDevicePkg/PlatformPkg.dec b/Vlv2TbltDevicePkg/PlatformPkg.dec index 378cb53..c5e0d24 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.dec +++ b/Vlv2TbltDevicePkg/PlatformPkg.dec @@ -1,10 +1,10 @@ #/** @file # Platform Package # # 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 # 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. @@ -150,13 +150,13 @@ gPlatformModuleTokenSpaceGuid.PcdFlashChipBase|0xFF800000|UINT32|0x40000001 gPlatformModuleTokenSpaceGuid.PcdFlashChipSize|0x00800000|UINT32|0x40000002 gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorBase|0xFF800000|UINT32|0x40000003 gPlatformModuleTokenSpaceGuid.PcdFlashDescriptorSize|0x00001000|UINT32|0x40000004 gPlatformModuleTokenSpaceGuid.PcdTxeRomBase|0xFF801000|UINT32|0x40000009 - gPlatformModuleTokenSpaceGuid.PcdTxeRomSize|0x004FF000|UINT32|0x4000000A - gPlatformModuleTokenSpaceGuid.PcdBiosRomBase|0xFFD00000|UINT32|0x4000000B - gPlatformModuleTokenSpaceGuid.PcdBiosRomSize|0x00300000|UINT32|0x4000000C + + gPlatformModuleTokenSpaceGuid.PcdTxeRomSize|0x003FF000|UINT32|0x400000 + 0A + gPlatformModuleTokenSpaceGuid.PcdBiosRomBase|0xFFC00000|UINT32|0x40000 + 00B + gPlatformModuleTokenSpaceGuid.PcdBiosRomSize|0x00400000|UINT32|0x40000 + 00C [PcdsFeatureFlag] ## This PCD specifies whether StatusCode is reported via ISA Serial port. gEfiSerialPortTokenSpaceGuid.PcdStatusCodeUseIsaSerial|TRUE|BOOLEAN|0x00000020 diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf index 2daa955..7c864da 100644 --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf @@ -13,49 +13,49 @@ # # #**/ [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_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_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_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_FSPBIN_OFFSET = 0x000B0000 +DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000 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_FVMAIN_OFFSET = 0x00100000 +DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000 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_RECOVERY_OFFSET = 0x002D0000 +DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003D0000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x00030000 ################################################################################ # # FD Section diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 5161563..8303c1b 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -13,50 +13,49 @@ # # #**/ [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_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_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_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_FSPBIN_OFFSET = 0x000B0000 +DEFINE FLASH_REGION_FSPBIN_OFFSET = 0x001B0000 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_FVMAIN_OFFSET = 0x00100000 +DEFINE FLASH_REGION_FVMAIN_OFFSET = 0x00200000 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_RECOVERY_OFFSET = 0x002C2000 + +DEFINE FLASH_REGION_FV_RECOVERY_OFFSET = 0x003C2000 DEFINE FLASH_REGION_FV_RECOVERY_SIZE = 0x0003E000 ################################################################################ # # FD Section diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc index 96f22cb..773f077 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc @@ -596,13 +596,13 @@ gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE [PcdsFixedAtBuild.common] !if $(MINNOW2_FSP_BUILD) == TRUE # $(FLASH_REGION_VLVMICROCODE_BASE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFD00000 + gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000 # $(FLASH_REGION_VLVMICROCODE_SIZE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 + gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 # $(FLASH_AREA_BASE_ADDRESS) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 # $(FLASH_AREA_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc index fd4e659..9d88504 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc @@ -596,13 +596,13 @@ gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE [PcdsFixedAtBuild.common] !if $(MINNOW2_FSP_BUILD) == TRUE # $(FLASH_REGION_VLVMICROCODE_BASE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFD00000 + gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000 # $(FLASH_REGION_VLVMICROCODE_SIZE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 + gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 # $(FLASH_AREA_BASE_ADDRESS) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 # $(FLASH_AREA_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc index a504195..d633b1c 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc @@ -596,13 +596,13 @@ gEfiCpuTokenSpaceGuid.PcdCpuSmmBlockStartupThisAp|TRUE [PcdsFixedAtBuild.common] !if $(MINNOW2_FSP_BUILD) == TRUE # $(FLASH_REGION_VLVMICROCODE_BASE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFD00000 + gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchAddress|0xFFC00000 # $(FLASH_REGION_VLVMICROCODE_SIZE) - gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00030000 + gFspWrapperTokenSpaceGuid.PcdCpuMicrocodePatchRegionSize|0x00040000 gFspWrapperTokenSpaceGuid.PcdFlashMicroCodeOffset|0x60 # $(FLASH_AREA_BASE_ADDRESS) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheAddress|0xFF800000 # $(FLASH_AREA_SIZE) gFspWrapperTokenSpaceGuid.PcdFlashCodeCacheSize|0x00800000 -- 2.6.2.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
