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>

diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
index 5398c12a9c9ca388d464c7c682e00068d5aaa61c..34337b2710ea70d7414af6bec9444a213dc1c882 100644 (file)
--- 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\r
     #\r
     parser.add_argument ("--capflag", dest = 'CapsuleFlag', action='append', default = [],\r
     # Add optional arguments for this command\r
     #\r
     parser.add_argument ("--capflag", dest = 'CapsuleFlag', action='append', default = [],\r

-                         choices=['PersistAcrossReset', 'PopulateSystemTable', 'InitiateReset'],\r
-                         help = "Capsule flag can be PersistAcrossReset, or PopulateSystemTable or InitiateReset or not set")\r
+                         choices=['PersistAcrossReset', 'InitiateReset'],\r
+                         help = "Capsule flag can be PersistAcrossReset or InitiateReset or not set")\r

     parser.add_argument ("--capoemflag", dest = 'CapsuleOemFlag', type = ValidateUnsignedInteger, default = 0x0000,\r
                          help = "Capsule OEM Flag is an integer between 0x0000 and 0xffff.")\r
 \r
     parser.add_argument ("--capoemflag", dest = 'CapsuleOemFlag', type = ValidateUnsignedInteger, default = 0x0000,\r
                          help = "Capsule OEM Flag is an integer between 0x0000 and 0xffff.")\r
 \r


@@ -294,8 +294,6 @@ if __name__ == '__main__':
         if args.Guid is None:\r
             parser.error ('the following option is required: --guid')\r
         if 'PersistAcrossReset' not in args.CapsuleFlag:\r
         if args.Guid is None:\r
             parser.error ('the following option is required: --guid')\r
         if 'PersistAcrossReset' not in args.CapsuleFlag:\r

-            if 'PopulateSystemTable' in args.CapsuleFlag:\r
-                parser.error ('--capflag PopulateSystemTable also requires --capflag PersistAcrossReset')\r

             if 'InitiateReset' in args.CapsuleFlag:\r
                 parser.error ('--capflag InitiateReset also requires --capflag PersistAcrossReset')\r
         if args.CapsuleOemFlag > 0xFFFF:\r
             if 'InitiateReset' in args.CapsuleFlag:\r
                 parser.error ('--capflag InitiateReset also requires --capflag PersistAcrossReset')\r
         if args.CapsuleOemFlag > 0xFFFF:\r


@@ -421,7 +419,7 @@ if __name__ == '__main__':
         try:\r
             UefiCapsuleHeader.OemFlags            = args.CapsuleOemFlag\r
             UefiCapsuleHeader.PersistAcrossReset  = 'PersistAcrossReset'  in args.CapsuleFlag\r
         try:\r
             UefiCapsuleHeader.OemFlags            = args.CapsuleOemFlag\r
             UefiCapsuleHeader.PersistAcrossReset  = 'PersistAcrossReset'  in args.CapsuleFlag\r

-            UefiCapsuleHeader.PopulateSystemTable = 'PopulateSystemTable' in args.CapsuleFlag\r
+            UefiCapsuleHeader.PopulateSystemTable = False\r

             UefiCapsuleHeader.InitiateReset       = 'InitiateReset'       in args.CapsuleFlag\r
             UefiCapsuleHeader.Payload             = Result\r
             Result = UefiCapsuleHeader.Encode ()\r
             UefiCapsuleHeader.InitiateReset       = 'InitiateReset'       in args.CapsuleFlag\r
             UefiCapsuleHeader.Payload             = Result\r
             Result = UefiCapsuleHeader.Encode ()\r