Revision: 17645
http://sourceforge.net/p/edk2/code/17645
Author: timhe
Date: 2015-06-16 07:45:55 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
Sync the branch changes to trunk.
Update the FCE tool to remove ?\226?\128?\156runtime access?\226?\128?\157 .
and recovery "Setup" variable in case of ?\226?\128?\156Setup?\226?\128?\157
Update IFWI_HEADER.bin as to set SPI lock bit.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Lu Shifei <[email protected]>
Reviewed-by: Tim He <[email protected]>
Modified Paths:
--------------
branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
Modified: branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
===================================================================
--- branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
2015-06-16 07:23:45 UTC (rev 17644)
+++ branches/UDK2014.SP1/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
2015-06-16 07:45:55 UTC (rev 17645)
@@ -483,18 +483,6 @@
(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 @@
(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 @@
// 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;
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
