From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1DDF1210C4DC2 for ; Sun, 29 Jul 2018 11:07:48 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jul 2018 11:07:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,419,1526367600"; d="scan'208";a="75539730" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.255.229.172]) by fmsmga004.fm.intel.com with ESMTP; 29 Jul 2018 11:07:47 -0700 From: "Kinney, Michael D" To: edk2-devel@lists.01.org Cc: Sean Brogan , Jiewen Yao , Yonghong Zhu , Liming Gao , Michael D Kinney Date: Sun, 29 Jul 2018 11:07:37 -0700 Message-Id: <20180729180743.1648-3-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com> References: <20180729180743.1648-1-michael.d.kinney@intel.com> Subject: [staging/FmpDevicePkg-master 2/8] BaseTools/Capsule: Remove support for PopulateSystemTable X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jul 2018 18:07:48 -0000 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 --- 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.14.2.windows.3