From 2779c222c80533677e0cb54cc19d0287d280647f Mon Sep 17 00:00:00 2001 From: "Kinney, Michael D" Date: Fri, 27 Jul 2018 12:31:22 -0700 Subject: [PATCH] BaseTools/Capsule: Remove support for PopulateSystemTable https://bugzilla.tianocore.org/show_bug.cgi?id=1030 Cc: Sean Brogan Cc: Jiewen Yao Cc: Yonghong Zhu Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Michael D Kinney Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/Capsule/GenerateCapsule.py | 8 +++----- 1 file 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 () -- 2.39.2