summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinney, Michael D <michael.d.kinney@intel.com>2018-07-27 12:31:22 -0700
committerStar Zeng <star.zeng@intel.com>2018-08-03 08:08:23 +0800
commitdbdbdecdb8db84605ddd9811290ce48585cbb3bc (patch)
tree6dc8da19ef6d3753dd0788e68e9d7fab3416083a
parentfade46c7c77288f56cb1621eaba2cae42efa05cb (diff)
downloadedk2-dbdbdecdb8db84605ddd9811290ce48585cbb3bc.tar.gz
BaseTools/Capsule: Remove support for PopulateSystemTable
https://bugzilla.tianocore.org/show_bug.cgi?id=1030 Cc: Sean Brogan <sean.brogan@microsoft.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Cc: Liming Gao <liming.gao@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> (cherry picked from commit 2779c222c80533677e0cb54cc19d0287d280647f)
-rw-r--r--BaseTools/Source/Python/Capsule/GenerateCapsule.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
index 5398c12a9c..34337b2710 100644
--- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py
+++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
@@ -239,8 +239,8 @@ if __name__ == '__main__':
# Add optional arguments for this command
#
parser.add_argument ("--capflag", dest = 'CapsuleFlag', action='append', default = [],
- choices=['PersistAcrossReset', 'PopulateSystemTable', 'InitiateReset'],
- help = "Capsule flag can be PersistAcrossReset, or PopulateSystemTable or InitiateReset or not set")
+ choices=['PersistAcrossReset', 'InitiateReset'],
+ help = "Capsule flag can be PersistAcrossReset or InitiateReset or not set")
parser.add_argument ("--capoemflag", dest = 'CapsuleOemFlag', type = ValidateUnsignedInteger, default = 0x0000,
help = "Capsule OEM Flag is an integer between 0x0000 and 0xffff.")
@@ -294,8 +294,6 @@ if __name__ == '__main__':
if args.Guid is None:
parser.error ('the following option is required: --guid')
if 'PersistAcrossReset' not in args.CapsuleFlag:
- if 'PopulateSystemTable' in args.CapsuleFlag:
- parser.error ('--capflag PopulateSystemTable also requires --capflag PersistAcrossReset')
if 'InitiateReset' in args.CapsuleFlag:
parser.error ('--capflag InitiateReset also requires --capflag PersistAcrossReset')
if args.CapsuleOemFlag > 0xFFFF:
@@ -421,7 +419,7 @@ if __name__ == '__main__':
try:
UefiCapsuleHeader.OemFlags = args.CapsuleOemFlag
UefiCapsuleHeader.PersistAcrossReset = 'PersistAcrossReset' in args.CapsuleFlag
- UefiCapsuleHeader.PopulateSystemTable = 'PopulateSystemTable' in args.CapsuleFlag
+ UefiCapsuleHeader.PopulateSystemTable = False
UefiCapsuleHeader.InitiateReset = 'InitiateReset' in args.CapsuleFlag
UefiCapsuleHeader.Payload = Result
Result = UefiCapsuleHeader.Encode ()