From 9ce9bf5339f8a5a9acfd77d9fbc70bb92a55dd6a Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Wed, 4 Jan 2017 10:40:54 +0800 Subject: BaseTools: not report error for the optional items in the FmpTokens in the FDF spec defined some optional items, eg: IMAGE_INDEX, HARDWARE_INSTANCE. but current tool report error if no such item is exist in the FDF file. Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=293 Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/GenFds/CapsuleData.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'BaseTools/Source/Python/GenFds/CapsuleData.py') diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Source/Python/GenFds/CapsuleData.py index d7a6d54aa8..24c210d964 100644 --- a/BaseTools/Source/Python/GenFds/CapsuleData.py +++ b/BaseTools/Source/Python/GenFds/CapsuleData.py @@ -1,7 +1,7 @@ ## @file # generate capsule # -# Copyright (c) 2007-2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2007-2017, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -186,7 +186,11 @@ class CapsulePayload(CapsuleData): def GenCapsuleSubItem(self, AuthData=[]): if not self.Version: - self.Version = 0x00000002 + self.Version = '0x00000002' + if not self.ImageIndex: + self.ImageIndex = '0x1' + if not self.HardwareInstance: + self.HardwareInstance = '0x0' ImageFileSize = os.path.getsize(self.ImageFile) if AuthData: # the ImageFileSize need include the full authenticated info size. From first bytes of MonotonicCount to last bytes of certificate. -- cgit v1.2.3