diff options
| author | jyao1 <jyao1> | 2014-08-06 13:27:14 +0000 |
|---|---|---|
| committer | jyao1 <jyao1@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-08-06 13:27:14 +0000 |
| commit | a81fcd30c1aff139f0007c277c49c52bf55c303c (patch) | |
| tree | 598d719348ac6667911ae81561a0dd9902793029 /IntelFspPkg | |
| parent | e7a8edfdf6128729737ec9eda360689a972b7c27 (diff) | |
| download | edk2-a81fcd30c1aff139f0007c277c49c52bf55c303c.tar.gz edk2-a81fcd30c1aff139f0007c277c49c52bf55c303c.tar.bz2 edk2-a81fcd30c1aff139f0007c277c49c52bf55c303c.zip | |
Eliminate duplicated file GUID.
Eliminate duplicate GUID definition.
Do explicit data cast.
Use StrnCpy instead of StrCpy.
Update GCC assembly.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed off by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed by: Eric Dong <eric.dong@intel.com>
Reviewed by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15762 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'IntelFspPkg')
4 files changed, 4 insertions, 5 deletions
diff --git a/IntelFspPkg/FspSecCore/FspSecCore.inf b/IntelFspPkg/FspSecCore/FspSecCore.inf index 18c5e76a6b..8767170a97 100644 --- a/IntelFspPkg/FspSecCore/FspSecCore.inf +++ b/IntelFspPkg/FspSecCore/FspSecCore.inf @@ -14,11 +14,10 @@ [Defines]
INF_VERSION = 0x00010005
BASE_NAME = FspSecCore
- FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09
+ FILE_GUID = 207CE046-0ADF-47c3-B9E3-844F12C398DD
MODULE_TYPE = SEC
VERSION_STRING = 1.0
-
#
# The following information is for reference only and not required by the build tools.
#
diff --git a/IntelFspPkg/Library/BaseCacheLib/CacheLib.c b/IntelFspPkg/Library/BaseCacheLib/CacheLib.c index aaaeb8b97b..5c77962393 100644 --- a/IntelFspPkg/Library/BaseCacheLib/CacheLib.c +++ b/IntelFspPkg/Library/BaseCacheLib/CacheLib.c @@ -159,7 +159,7 @@ EfiRecoverCacheMtrr ( //
if (EnableMtrr) {
TempQword = AsmReadMsr64(EFI_MSR_CACHE_IA32_MTRR_DEF_TYPE);
- TempQword |= (B_EFI_MSR_GLOBAL_MTRR_ENABLE | B_EFI_MSR_FIXED_MTRR_ENABLE);
+ TempQword |= (UINT64)(B_EFI_MSR_GLOBAL_MTRR_ENABLE | B_EFI_MSR_FIXED_MTRR_ENABLE);
} else {
TempQword = OldMtrr;
}
diff --git a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c index 467d59db0e..55a917b918 100644 --- a/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c +++ b/IntelFspPkg/Library/BaseFspDebugLibSerialPort/DebugLib.c @@ -148,7 +148,7 @@ DebugAssertInternal ( //
// Generate the ASSERT() message in Ascii format
//
- AsciiStrCpy (Buffer, "-> EBP:0x00000000 EIP:0x00000000\n");
+ AsciiStrnCpy (Buffer, sizeof(Buffer), "-> EBP:0x00000000 EIP:0x00000000\n");
SerialPortWrite ((UINT8 *)"ASSERT DUMP:\n", 13);
while (Frame != NULL) {
FillHex ((UINT32)Frame, Buffer + 9);
diff --git a/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformNotify.c b/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformNotify.c index 3488fbc61c..ef4406bec5 100644 --- a/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformNotify.c +++ b/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformNotify.c @@ -141,7 +141,7 @@ FspWaitForNotify ( NotificatonCount = 0;
while (NotificatonCount < sizeof(mFspNotfifySequence) / sizeof(UINT32)) {
- Count = (NotificatonCount << 1) & 0x07;
+ Count = (UINT8)((NotificatonCount << 1) & 0x07);
SetFspMeasurePoint (FSP_PERF_ID_API_NOTIFY_POSTPCI_ENTRY + Count);
NotificatonValue = ((NOTIFY_PHASE_PARAMS *)(UINTN)GetFspApiParameter ())->Phase;
|