diff options
| author | Chasel Chiu <chasel.chiu@intel.com> | 2021-12-28 16:58:04 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-12-29 02:03:25 +0000 |
| commit | 7935be0fbd8f47266e5972f4cba1a1e58505061a (patch) | |
| tree | c341066c8d362a147bda1ea12344f3fe3cc5a4e3 | |
| parent | e910f076ad02c80bb69cebb18d51ef6896beee0d (diff) | |
| download | edk2-7935be0fbd8f47266e5972f4cba1a1e58505061a.tar.gz edk2-7935be0fbd8f47266e5972f4cba1a1e58505061a.tar.bz2 edk2-7935be0fbd8f47266e5972f4cba1a1e58505061a.zip | |
IntelFsp2Pkg/FspSecCore: ExtendedImageRevision was not printed.
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3791
ExtendedImageRevision should be printed when Header revision >= 6.
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
| -rw-r--r-- | IntelFsp2Pkg/FspSecCore/SecFsp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c index ae03fa228e..f79d45900e 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)
));
}
|