sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools/Capsule: Remove support for PopulateSystemTable

Browse Source 
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>
This commit is contained in:
Kinney, Michael D
2018-07-27 12:31:22 -07:00
parent 6ed4651cb5
commit 2779c222c8
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BaseTools/Source/Python/Capsule/GenerateCapsule.py
View File

@ -239,8 +239,8 @@ if __name__ == '__main__':
# Add optional arguments for this command # Add optional arguments for this command
# #
parser.add_argument ("--capflag", dest = 'CapsuleFlag', action='append', default = [], parser.add_argument ("--capflag", dest = 'CapsuleFlag', action='append', default = [],
choices=['PersistAcrossReset', 'PopulateSystemTable', 'InitiateReset'], choices=['PersistAcrossReset', 'InitiateReset'],
help = "Capsule flag can be PersistAcrossReset, or PopulateSystemTable or InitiateReset or not set") help = "Capsule flag can be PersistAcrossReset or InitiateReset or not set")
parser.add_argument ("--capoemflag", dest = 'CapsuleOemFlag', type = ValidateUnsignedInteger, default = 0x0000, parser.add_argument ("--capoemflag", dest = 'CapsuleOemFlag', type = ValidateUnsignedInteger, default = 0x0000,
help = "Capsule OEM Flag is an integer between 0x0000 and 0xffff.") help = "Capsule OEM Flag is an integer between 0x0000 and 0xffff.")
@ -294,8 +294,6 @@ if __name__ == '__main__':
if args.Guid is None: if args.Guid is None:
parser.error ('the following option is required: --guid') parser.error ('the following option is required: --guid')
if 'PersistAcrossReset' not in args.CapsuleFlag: if 'PersistAcrossReset' not in args.CapsuleFlag:
if 'PopulateSystemTable' in args.CapsuleFlag:
parser.error ('--capflag PopulateSystemTable also requires --capflag PersistAcrossReset')
if 'InitiateReset' in args.CapsuleFlag: if 'InitiateReset' in args.CapsuleFlag:
parser.error ('--capflag InitiateReset also requires --capflag PersistAcrossReset') parser.error ('--capflag InitiateReset also requires --capflag PersistAcrossReset')
if args.CapsuleOemFlag > 0xFFFF: if args.CapsuleOemFlag > 0xFFFF:
@ -421,7 +419,7 @@ if __name__ == '__main__':
try: try:
UefiCapsuleHeader.OemFlags = args.CapsuleOemFlag UefiCapsuleHeader.OemFlags = args.CapsuleOemFlag
UefiCapsuleHeader.PersistAcrossReset = 'PersistAcrossReset' in args.CapsuleFlag UefiCapsuleHeader.PersistAcrossReset = 'PersistAcrossReset' in args.CapsuleFlag
UefiCapsuleHeader.PopulateSystemTable = 'PopulateSystemTable' in args.CapsuleFlag UefiCapsuleHeader.PopulateSystemTable = False
UefiCapsuleHeader.InitiateReset = 'InitiateReset' in args.CapsuleFlag UefiCapsuleHeader.InitiateReset = 'InitiateReset' in args.CapsuleFlag
UefiCapsuleHeader.Payload = Result UefiCapsuleHeader.Payload = Result
Result = UefiCapsuleHeader.Encode () Result = UefiCapsuleHeader.Encode ()