Vlv2TbltDevicePkg: Changed value of PcdFlashAreaBaseAddress

The PCD PcdFlashAreaBaseAddress should be 0xFF800000, but it's 0xFFC00000 due to wrong value assignment in platform fdf.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Guo Mang <mang.guo@intel.com>

5 files changed, 10 insertions, 12 deletions

diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
index 3d8cbe0ed5..ad18da5c61 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2004  - 2017, Intel Corporation. All rights reserved.<BR>

                                                                                    

 

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

@@ -442,13 +442,13 @@ SpiBiosProtectionFunction(
   UINTN                             BiosFlaLimit1;  

   

 

-  BiosFlaLower0 = PcdGet32(PcdFlashMicroCodeAddress)-PcdGet32(PcdFlashAreaBaseAddress);

+  BiosFlaLower0 = PcdGet32(PcdFlashMicroCodeAddress)-PcdGet32(PcdBiosImageBase);

   BiosFlaLimit0 = PcdGet32(PcdFlashMicroCodeSize)-1;  

   #ifdef MINNOW2_FSP_BUILD

-  BiosFlaLower1 = PcdGet32(PcdFlashFvFspBase)-PcdGet32(PcdFlashAreaBaseAddress);

+  BiosFlaLower1 = PcdGet32(PcdFlashFvFspBase)-PcdGet32(PcdBiosImageBase);

   BiosFlaLimit1 = (PcdGet32(PcdFlashFvRecoveryBase)-PcdGet32(PcdFlashFvFspBase)+PcdGet32(PcdFlashFvRecoverySize))-1;

   #else

-  BiosFlaLower1 = PcdGet32(PcdFlashFvMainBase)-PcdGet32(PcdFlashAreaBaseAddress);

+  BiosFlaLower1 = PcdGet32(PcdFlashFvMainBase)-PcdGet32(PcdBiosImageBase);

   BiosFlaLimit1 = (PcdGet32(PcdFlashFvRecoveryBase)-PcdGet32(PcdFlashFvMainBase)+PcdGet32(PcdFlashFvRecoverySize))-1;

   #endif

 

diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
index 80bf8829ef..f1e1d9e5f1 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
+++ b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
@@ -135,7 +135,7 @@
 [Pcd.common]

   gPlatformModuleTokenSpaceGuid.PcdPBTNDisableInterval

   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress

+  gPlatformModuleTokenSpaceGuid.PcdBiosImageBase

   gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeAddress

   gPlatformModuleTokenSpaceGuid.PcdFlashMicroCodeSize

   gEfiMdeModulePkgTokenSpaceGuid.PcdFastPS2Detection

diff --git a/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf b/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
index 97c8dfbef7..6a269fc31f 100644
--- a/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
+++ b/Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf
@@ -1,6 +1,6 @@
 #

 #

-# Copyright (c)  1999  - 2016, Intel Corporation. All rights reserved

+# Copyright (c)  1999  - 2017, Intel Corporation. All rights reserved

 #                                                                                  


 # This program and the accompanying materials are licensed and made available under


 # the terms and conditions of the BSD License that accompanies this distribution.  


@@ -132,8 +132,6 @@
   gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Base

   gPlatformModuleTokenSpaceGuid.PcdFlashFvRecovery2Size

   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress

-  gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize

   gPlatformModuleTokenSpaceGuid.PcdRtcPowerFailure

 [Depex]

   TRUE

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 3a29715a67..9af2f778e3 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -70,8 +70,8 @@ DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00070000
 #
 ################################################################################
 [FD.Vlv]
-BaseAddress   = $(FLASH_BASE)|gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress #The base address of the 3Mb FLASH Device.
-Size          = $(FLASH_SIZE)|gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize        #The flash size in bytes of the 3Mb FLASH Device.
+BaseAddress   = $(FLASH_BASE)|gPlatformModuleTokenSpaceGuid.PcdBiosImageBase #The base address of the 3Mb FLASH Device.
+Size          = $(FLASH_SIZE)|gPlatformModuleTokenSpaceGuid.PcdBiosImageSize        #The flash size in bytes of the 3Mb FLASH Device.
 ErasePolarity = 1
 BlockSize     = $(FLASH_BLOCK_SIZE)          #The block size in bytes of the 3Mb FLASH Device.
 NumBlocks     = $(FLASH_NUM_BLOCKS)          #The number of blocks in 3Mb FLASH Device.
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 9e0799f499..e450edc92f 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -70,8 +70,8 @@ DEFINE FLASH_REGION_FV_RECOVERY_SIZE                          = 0x00070000
 #
 ################################################################################
 [FD.Vlv]
-BaseAddress   = $(FLASH_BASE)|gPlatformModuleTokenSpaceGuid.PcdFlashAreaBaseAddress #The base address of the 3Mb FLASH Device.
-Size          = $(FLASH_SIZE)|gPlatformModuleTokenSpaceGuid.PcdFlashAreaSize        #The flash size in bytes of the 3Mb FLASH Device.
+BaseAddress   = $(FLASH_BASE)|gPlatformModuleTokenSpaceGuid.PcdBiosImageBase #The base address of the 3Mb FLASH Device.
+Size          = $(FLASH_SIZE)|gPlatformModuleTokenSpaceGuid.PcdBiosImageSize        #The flash size in bytes of the 3Mb FLASH Device.
 ErasePolarity = 1
 BlockSize     = $(FLASH_BLOCK_SIZE)          #The block size in bytes of the 3Mb FLASH Device.
 NumBlocks     = $(FLASH_NUM_BLOCKS)          #The number of blocks in 3Mb FLASH Device.