summaryrefslogtreecommitdiff
path: root/IntelFsp2Pkg
diff options
context:
space:
mode:
Diffstat (limited to 'IntelFsp2Pkg')
-rw-r--r--IntelFsp2Pkg/FspSecCore/SecFsp.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index ae03fa2..f79d459 100644
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -1,6 +1,6 @@
/** @file
- Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2014 - 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -199,8 +199,12 @@ FspGlobalDataInit (
ImageId, \
(PeiFspData->FspInfoHeader->ImageRevision >> 24) & 0xFF, \
(PeiFspData->FspInfoHeader->ImageRevision >> 16) & 0xFF, \
- (PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF, \
- PeiFspData->FspInfoHeader->ImageRevision & 0xFF
+ (PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \
+ (((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF) | (PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF00)) :\
+ ((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF), \
+ (PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \
+ ((PeiFspData->FspInfoHeader->ImageRevision & 0xFF) | ((PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF) << 8)): \
+ (PeiFspData->FspInfoHeader->ImageRevision & 0xFF)
));
}