Nt32Pkg/Nt32Pkg.fdf: Increase the size of FLASH Device.

[edk2] [Patch] Nt32Pkg/Nt32Pkg.fdf: Increase the size of FLASH Device.

Posted by Jiaxin Wu 6 years, 10 months ago

Currently, the FV image size is not enough for the modules after
we enable some flags defined in Nt32Pkg.dsc, e.g:
 DEFINE SECURE_BOOT_ENABLE      = TRUE
 DEFINE TLS_ENABLE              = TRUE
 DEFINE NETWORK_IP6_ENABLE      = TRUE

This patch is to increase the size of FLASH Device to meet the requirement.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 Nt32Pkg/Nt32Pkg.fdf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index d104cb7..db2719f 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -26,14 +26,14 @@
 # existing system flash.
 #
 ################################################################################
 [FD.Nt32]
 BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress          #The base address of the FLASH Device.
-Size          = 0x00380000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size in bytes of the FLASH Device
+Size          = 0x00480000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size in bytes of the FLASH Device
 ErasePolarity = 1
 BlockSize     = 0x10000
-NumBlocks     = 0x38
+NumBlocks     = 0x48
 
 ################################################################################
 #
 # Following are lists of FD Region layout which correspond to the locations of different
 # images within the flash device.
@@ -46,15 +46,15 @@ NumBlocks     = 0x38
 # Offset|Size
 # PcdOffsetCName|PcdSizeCName
 # RegionType <FV, DATA, or FILE>
 #
 ################################################################################
-0x00000000|0x00360000
+0x00000000|0x00460000
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoverySize
 FV = FvRecovery
 
-0x00360000|0x0000c000
+0x00460000|0x0000c000
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
 #NV_VARIABLE_STORE
 DATA = {
   ## This is the EFI_FIRMWARE_VOLUME_HEADER
   # ZeroVector []
@@ -91,15 +91,15 @@ DATA = {
   0xB8, 0xBF, 0x00, 0x00,
   #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32
   0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
-0x0036c000|0x00002000
+0x0046c000|0x00002000
 #NV_EVENT_LOG
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
 
-0x0036e000|0x00002000
+0x0046e000|0x00002000
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
 #NV_FTW_WORKING
 DATA = {
   # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =
   #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}
@@ -109,11 +109,11 @@ DATA = {
   0xE2, 0x33, 0xF2, 0x03, 0xFE, 0xFF, 0xFF, 0xFF,
   # WriteQueueSize: UINT64
   0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 }
 
-0x00370000|0x00010000
+0x00470000|0x00010000
 #NV_FTW_SPARE
 gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
 
 ################################################################################
 #
-- 
1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] Nt32Pkg/Nt32Pkg.fdf: Increase the size of FLASH Device.

Posted by Wu, Hao A 6 years, 10 months ago

Reviewed-by: Hao Wu <hao.a.wu@intel.com>


Best Regards,
Hao Wu


> -----Original Message-----
> From: Wu, Jiaxin
> Sent: Tuesday, January 30, 2018 10:04 AM
> To: edk2-devel@lists.01.org
> Cc: Ni, Ruiyu; Wu, Hao A; Ye, Ting; Fu, Siyuan; Wu, Jiaxin
> Subject: [Patch] Nt32Pkg/Nt32Pkg.fdf: Increase the size of FLASH Device.
> 
> Currently, the FV image size is not enough for the modules after
> we enable some flags defined in Nt32Pkg.dsc, e.g:
>  DEFINE SECURE_BOOT_ENABLE      = TRUE
>  DEFINE TLS_ENABLE              = TRUE
>  DEFINE NETWORK_IP6_ENABLE      = TRUE
> 
> This patch is to increase the size of FLASH Device to meet the requirement.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Ye Ting <ting.ye@intel.com>
> Cc: Fu Siyuan <siyuan.fu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
> ---
>  Nt32Pkg/Nt32Pkg.fdf | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
> index d104cb7..db2719f 100644
> --- a/Nt32Pkg/Nt32Pkg.fdf
> +++ b/Nt32Pkg/Nt32Pkg.fdf
> @@ -26,14 +26,14 @@
>  # existing system flash.
>  #
> 
> ################################################################
> ################
>  [FD.Nt32]
>  BaseAddress   = 0x0|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFdBaseAddress
> #The base address of the FLASH Device.
> -Size          =
> 0x00380000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size
> in bytes of the FLASH Device
> +Size          =
> 0x00480000|gEfiNt32PkgTokenSpaceGuid.PcdWinNtFirmwareFdSize  #The size
> in bytes of the FLASH Device
>  ErasePolarity = 1
>  BlockSize     = 0x10000
> -NumBlocks     = 0x38
> +NumBlocks     = 0x48
> 
> 
> ################################################################
> ################
>  #
>  # Following are lists of FD Region layout which correspond to the locations of
> different
>  # images within the flash device.
> @@ -46,15 +46,15 @@ NumBlocks     = 0x38
>  # Offset|Size
>  # PcdOffsetCName|PcdSizeCName
>  # RegionType <FV, DATA, or FILE>
>  #
> 
> ################################################################
> ################
> -0x00000000|0x00360000
> +0x00000000|0x00460000
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashFvRecoveryBase|gEfiNt32PkgToken
> SpaceGuid.PcdWinNtFlashFvRecoverySize
>  FV = FvRecovery
> 
> -0x00360000|0x0000c000
> +0x00460000|0x0000c000
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageVariableBase|gEfiMdeM
> odulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
>  #NV_VARIABLE_STORE
>  DATA = {
>    ## This is the EFI_FIRMWARE_VOLUME_HEADER
>    # ZeroVector []
> @@ -91,15 +91,15 @@ DATA = {
>    0xB8, 0xBF, 0x00, 0x00,
>    #FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32
>    0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
>  }
> 
> -0x0036c000|0x00002000
> +0x0046c000|0x00002000
>  #NV_EVENT_LOG
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogBase|gEfiNt32P
> kgTokenSpaceGuid.PcdWinNtFlashNvStorageEventLogSize
> 
> -0x0036e000|0x00002000
> +0x0046e000|0x00002000
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwWorkingBase|gEfiMd
> eModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
>  #NV_FTW_WORKING
>  DATA = {
>    # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature =
> gEdkiiWorkingBlockSignatureGuid         =
>    #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b,
> 0x95 }}
> @@ -109,11 +109,11 @@ DATA = {
>    0xE2, 0x33, 0xF2, 0x03, 0xFE, 0xFF, 0xFF, 0xFF,
>    # WriteQueueSize: UINT64
>    0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
>  }
> 
> -0x00370000|0x00010000
> +0x00470000|0x00010000
>  #NV_FTW_SPARE
> 
> gEfiNt32PkgTokenSpaceGuid.PcdWinNtFlashNvStorageFtwSpareBase|gEfiMdeM
> odulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
> 
> 
> ################################################################
> ################
>  #
> --
> 1.9.5.msysgit.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel