diff options
| author | Lu Shifei <shifeix.a.lu@intel.com> | 2015-06-16 07:45:55 +0000 |
|---|---|---|
| committer | timhe <timhe@Edk2> | 2015-06-16 07:45:55 +0000 |
| commit | 8ee2b2366f75fb26aa53bda0d652773e1c28e36c (patch) | |
| tree | ea730c945ece28fdb3488456ed0049c1e7e85681 /Vlv2TbltDevicePkg | |
| parent | ba617bea3c4aa296185395bdf0d8716657b72d58 (diff) | |
| download | edk2-8ee2b2366f75fb26aa53bda0d652773e1c28e36c.tar.gz | |
Sync the branch changes to trunk.
Update the FCE tool to remove “runtime access” .
and recovery "Setup" variable in case of “Setup”
Update IFWI_HEADER.bin as to set SPI lock bit.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Lu Shifei <shifeix.a.lu@intel.com>
Reviewed-by: Tim He <tim.he@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2014.SP1@17645 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Vlv2TbltDevicePkg')
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c index a1cd072c8f..d278694146 100644 --- a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c +++ b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c @@ -483,18 +483,6 @@ SpiBiosProtectionFunction( (B_PCH_SPI_PR0_PRB_MASK&(BiosFlaLower0>>12))|(B_PCH_SPI_PR0_PRL_MASK&(BiosFlaLimit0>>12)<<16));
//
- //Lock down PR0
- //
- MmioOr16 ((UINTN) (SpiBase + R_PCH_SPI_HSFS), (UINT16) (B_PCH_SPI_HSFS_FLOCKDN));
-
- //
- // Verify if it's really locked.
- //
- if ((MmioRead16 (SpiBase + R_PCH_SPI_HSFS) & B_PCH_SPI_HSFS_FLOCKDN) == 0) {
- DEBUG((EFI_D_ERROR, "Failed to lock down PR0.\n"));
- }
-
- //
//Set PR1
//
@@ -503,7 +491,7 @@ SpiBiosProtectionFunction( (B_PCH_SPI_PR1_PRB_MASK&(BiosFlaLower1>>12))|(B_PCH_SPI_PR1_PRL_MASK&(BiosFlaLimit1>>12)<<16));
//
- //Lock down PR1
+ //Lock down PRx
//
MmioOr16 ((UINTN) (SpiBase + R_PCH_SPI_HSFS), (UINT16) (B_PCH_SPI_HSFS_FLOCKDN));
@@ -511,7 +499,7 @@ SpiBiosProtectionFunction( // Verify if it's really locked.
//
if ((MmioRead16 (SpiBase + R_PCH_SPI_HSFS) & B_PCH_SPI_HSFS_FLOCKDN) == 0) {
- DEBUG((EFI_D_ERROR, "Failed to lock down PR1.\n"));
+ DEBUG((EFI_D_ERROR, "Failed to lock down PRx.\n"));
}
return;
|