From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: suse.com, ip: 15.124.2.86, mailfrom: glin@suse.com) Received: from m4a0040g.houston.softwaregrp.com (m4a0040g.houston.softwaregrp.com [15.124.2.86]) by groups.io with SMTP; Tue, 23 Jul 2019 01:45:46 -0700 Received: FROM m4a0040g.houston.softwaregrp.com (15.120.17.146) BY m4a0040g.houston.softwaregrp.com WITH ESMTP; Tue, 23 Jul 2019 08:41:47 +0000 Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M4W0334.microfocus.com (2002:f78:1192::f78:1192) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Tue, 23 Jul 2019 08:43:39 +0000 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (15.124.72.14) by M9W0068.microfocus.com (15.121.0.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Tue, 23 Jul 2019 08:43:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IeXdx3SJX89th8pftaSR7B0wyOXvekdeCgFUWTUaPfHkHgT94RNgVegWDFgEXOUuYmSanGPPkWHX9vc7wcXDTM+bT7v221EegTwuXzIZkKqY6DyIQpngcu8VTtGAKRLPpJLzR+hq2b3GIYPWA0UjQtn6GmkwvfM0u054RRzcKpzMHn2hRUnPGi8fKjzd94GPAr8VXcCR9Bz7d686RlKaAQ1qxMTASaqRwxPYWOMp0/Fi0lSYZcIeFSJRacNg19kRZmG2NSGN5Njutbi/X2s5IY7LmtGbzPIygD+pNOop/FQVf7KQGATyYXmU/CMu4J5FircyNnlM3vvs0Riw54MFmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e2f/wsauhUM5ZKIg5c+M+4Ik1nR1ciQasfhkgQxhe2g=; b=dbjn9eXJaw9P/QYdUf9AzpoHxu9DWhUbTskyvY5rhSfyWV7U6KKvK/w5R2bCD6vsaotbGKvNGR5FBJ2byQkRzMFuWS9t0CuVRuRE9U/FFN779JPQAcyPdd5ldxjs6CkkwethzOVNvgfYaVcjNgfR+JY2uUSGOOvw3QEL9zAdBdBAjSxt0mqt53Ih+b+VAcb2B2wZd5LLzokhVeFesnazm0hctDAnTbj6YC4+D1yKfzjHO+kMTkyJIRxXGAiKUMKd977dJGBPQ3gJ0ncwJoHneA1sqTixfQEPb8xIabiVcqWNKIbnMNEq+vZ/CfzqHjZsBOeR73mx+ZCB8hynwdbKkw== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=suse.com;dmarc=pass action=none header.from=suse.com;dkim=pass header.d=suse.com;arc=none Received: from DM6PR18MB2489.namprd18.prod.outlook.com (20.179.105.16) by DM6PR18MB3401.namprd18.prod.outlook.com (10.255.174.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2073.11; Tue, 23 Jul 2019 08:43:37 +0000 Received: from DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0]) by DM6PR18MB2489.namprd18.prod.outlook.com ([fe80::ac83:47c9:cebd:9f0%7]) with mapi id 15.20.2094.013; Tue, 23 Jul 2019 08:43:37 +0000 From: "Gary Lin" To: Michael D Kinney CC: "devel@edk2.groups.io" , Yi Qian , Zailiang Sun Subject: Re: [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python Thread-Topic: [edk2-platforms Patch V3 04/12] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python Thread-Index: AQHVQOEaWABEOOMCckSbBmVQ2lz7iqbX454A Date: Tue, 23 Jul 2019 08:43:37 +0000 Message-ID: <20190723084324.GE4466@GaryWorkstation> References: <20190722225859.24724-1-michael.d.kinney@intel.com> <20190722225859.24724-5-michael.d.kinney@intel.com> In-Reply-To: <20190722225859.24724-5-michael.d.kinney@intel.com> Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: DB6PR0201CA0011.eurprd02.prod.outlook.com (2603:10a6:4:3f::21) To DM6PR18MB2489.namprd18.prod.outlook.com (2603:10b6:5:184::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=GLin@suse.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [202.47.205.198] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: fd6ead07-00ea-4381-3a59-08d70f49da3b x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020);SRVR:DM6PR18MB3401; x-ms-traffictypediagnostic: DM6PR18MB3401: x-ms-exchange-purlcount: 1 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:556; x-forefront-prvs: 0107098B6C x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(7916004)(136003)(376002)(396003)(39860400002)(366004)(346002)(199004)(189003)(14444005)(68736007)(256004)(99286004)(26005)(11346002)(6246003)(4326008)(8936002)(25786009)(446003)(30864003)(486006)(19627235002)(102836004)(6916009)(6506007)(386003)(52116002)(476003)(186003)(54906003)(66446008)(33656002)(6486002)(76176011)(1076003)(966005)(81156014)(7736002)(80792005)(9686003)(478600001)(33716001)(71200400001)(64756008)(5660300002)(53946003)(66946007)(66556008)(6436002)(86362001)(53386004)(66066001)(53936002)(8676002)(316002)(71190400001)(81166006)(3846002)(14454004)(6116002)(305945005)(66476007)(6512007)(2906002)(6306002)(229853002)(569006);DIR:OUT;SFP:1102;SCL:1;SRVR:DM6PR18MB3401;H:DM6PR18MB2489.namprd18.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: suse.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: rMZ9daNAV6iwXDe/udzpAFJHJYalAwZS+xelYqLc00zg7f5Z8eiG8Shn8o0glWqGUJBV9/tGPCoieyzFIgx80Pb24oQqEyFMXUIzfHPJSDzXJwFZ8dTKd2BKNv9VNK/iJs5TdPXPQYNA8B59028oAthHhczpjoAfjGq4ORBywfpaXOaX224MV7U84jf7DE+wLOa47b53cf/aCA8zQKL7Vn4vOpCjX5KCXlOVR6wjs2qX22b2ud6xi9lydLHZGTgoKvJdYP5Mt72iiCeUhdXH87W1Rk0Aq/gd4GLKCH/saO9JoKSgGNX90LCAzVzHBPj1/iSc2qKg29O1PNa0ipflVLZWLNSiYXcJbtH8wNE7SgK6jtOY18p1iJtUv+x1xeF43OxVpshW1ptRlmrXDiyxJ7NHDbLjMLJexo+wyRGVQyE= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: fd6ead07-00ea-4381-3a59-08d70f49da3b X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jul 2019 08:43:37.1694 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GLin@suse.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR18MB3401 Return-Path: GLin@suse.com X-OriginatorOrg: suse.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-ID: <41ADECA87C294B4EAB235FD407E80CF2@namprd18.prod.outlook.com> Content-Transfer-Encoding: quoted-printable On Mon, Jul 22, 2019 at 03:58:51PM -0700, Michael D Kinney wrote: > Convert all the BAT/sh files used to generate capsules to > OS independent Python script. >=20 Reviewed-by: Gary Lin > Cc: Zailiang Sun > Cc: Yi Qian > Cc: Gary Lin > Signed-off-by: Michael D Kinney > Reviewed-by: Zailiang Sun > --- > .../Capsule/GenerateCapsule/GenCapsuleAll.bat | 35 -- > .../Capsule/GenerateCapsule/GenCapsuleAll.py | 397 ++++++++++++++++++ > .../Capsule/GenerateCapsule/GenCapsuleAll.sh | 33 -- > .../GenerateCapsule/GenCapsuleMinnowMax.bat | 131 ------ > .../GenerateCapsule/GenCapsuleMinnowMax.sh | 59 --- > .../GenCapsuleMinnowMaxRelease.bat | 131 ------ > .../GenCapsuleMinnowMaxRelease.sh | 64 --- > .../GenerateCapsule/GenCapsuleSampleColor.bat | 137 ------ > .../GenerateCapsule/GenCapsuleSampleColor.sh | 70 --- > .../Feature/Capsule/GenerateCapsule/Lvfs.ddf | 14 - > .../LvfsGenCapsuleMinnowMax.bat | 139 ------ > .../LvfsGenCapsuleMinnowMaxRelease.bat | 139 ------ > .../LvfsGenCapsuleSampleColor.bat | 145 ------- > .../GenerateCapsule/template.metainfo.xml | 27 -- > .../Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc | 2 +- > .../Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc | 2 +- > 16 files changed, 399 insertions(+), 1126 deletions(-) > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleAll.bat > create mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleAll.py > delete mode 100755 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleAll.sh > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleMinnowMax.bat > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleMinnowMax.sh > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleMinnowMaxRelease.bat > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleMinnowMaxRelease.sh > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleSampleColor.bat > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/GenCapsuleSampleColor.sh > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/Lvfs.ddf > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/LvfsGenCapsuleMinnowMax.bat > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/LvfsGenCapsuleMinnowMaxRelease.bat > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/LvfsGenCapsuleSampleColor.bat > delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Gene= rateCapsule/template.metainfo.xml >=20 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleAll.bat b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/G= enerateCapsule/GenCapsuleAll.bat > deleted file mode 100644 > index 8f589565fa..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleAll.bat > +++ /dev/null > @@ -1,35 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware = and > -@REM firmware for sample devices > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > -cd /d %~dp0 > - > -rmdir /s /q %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert > -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.= efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment\CapsuleA= pp.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleAp= p.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDevelopment\Capsul= eAppRelease.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.= efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\CapsuleApp.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleAp= p.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\CapsuleAppReleas= e.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\CapsuleApp.= efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\CapsuleApp.efi > -copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\CapsuleAp= p.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\CapsuleAppRelea= se.efi > - > -call GenCapsuleMinnowMax.bat > -call GenCapsuleMinnowMaxRelease.bat > -call GenCapsuleSampleColor.bat Blue 149da854-7d19-4faa-a91e-862ea1324be= 6 > -call GenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-0ab8d968c18= a > -call GenCapsuleSampleColor.bat Red 72e2945a-00da-448e-9aa7-075ad840f9d= 4 > - > -call LvfsGenCapsuleMinnowMax.bat > -call LvfsGenCapsuleMinnowMaxRelease.bat > -call LvfsGenCapsuleSampleColor.bat Blue 149da854-7d19-4faa-a91e-862ea13= 24be6 > -call LvfsGenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-0ab8d96= 8c18a > -call LvfsGenCapsuleSampleColor.bat Red 72e2945a-00da-448e-9aa7-075ad84= 0f9d4 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleAll.py b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Ge= nerateCapsule/GenCapsuleAll.py > new file mode 100644 > index 0000000000..b2fd65a6c6 > --- /dev/null > +++ b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleAll.py > @@ -0,0 +1,397 @@ > +## @file > +# Generate capsules for Vlv2TbltDevicePkg > +# openssl must be install and in path > +# > +# Copyright (c) 2019, Intel Corporation. All rights reserved.
> +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > + > +''' > +GenCapsuleAll > +''' > + > +import os > +import sys > +import argparse > +import subprocess > +import glob > +import shutil > +import struct > +import datetime > + > +# > +# Globals for help information > +# > +__prog__ =3D 'GenCapsuleAll' > +__copyright__ =3D 'Copyright (c) 2019, Intel Corporation. All rights r= eserved.' > +__description__ =3D 'Generate Vlv2Tbl2DevicePkg capsules.\n' > + > +# > +# Globals > +# > +gWorkspace =3D '' > +gBaseToolsPath =3D '' > +gArgs =3D None > + > +def LogAlways(Message): > + sys.stdout.write (__prog__ + ': ' + Message + '\n') > + sys.stdout.flush() > + > +def Log(Message): > + global gArgs > + if not gArgs.Verbose: > + return > + sys.stdout.write (__prog__ + ': ' + Message + '\n') > + sys.stdout.flush() > + > +def Error(Message, ExitValue=3D1): > + sys.stderr.write (__prog__ + ': ERROR: ' + Message + '\n') > + sys.exit (ExitValue) > + > +def RelativePath(target): > + global gWorkspace > + Log('RelativePath' + target) > + return os.path.relpath (target, gWorkspace) > + > +def NormalizePath(target): > + if isinstance(target, tuple): > + return os.path.normpath (os.path.join (*target)) > + else: > + return os.path.normpath (target) > + > +def RemoveFile(target): > + target =3D NormalizePath(target) > + if not target or target =3D=3D os.pathsep: > + Error ('RemoveFile() invalid target') > + if os.path.exists(target): > + os.remove (target) > + Log ('remove %s' % (RelativePath (target))) > + > +def RemoveDirectory(target): > + target =3D NormalizePath(target) > + if not target or target =3D=3D os.pathsep: > + Error ('RemoveDirectory() invalid target') > + if os.path.exists(target): > + Log ('rmdir %s' % (RelativePath (target))) > + shutil.rmtree(target) > + > +def CreateDirectory(target): > + target =3D NormalizePath(target) > + if not os.path.exists(target): > + Log ('mkdir %s' % (RelativePath (target))) > + os.makedirs (target) > + > +def Copy(src, dst): > + src =3D NormalizePath(src) > + dst =3D NormalizePath(dst) > + for File in glob.glob(src): > + Log ('copy %s -> %s' % (RelativePath (File), RelativePath (dst))= ) > + shutil.copy (File, dst) > + > +GenerateCapsuleCommand =3D ''' > +GenerateCapsule > +--encode > +--guid {FMP_CAPSULE_GUID} > +--fw-version {FMP_CAPSULE_VERSION} > +--lsv {FMP_CAPSULE_LSV} > +--capflag PersistAcrossReset > +--capflag InitiateReset > +--signer-private-cert=3D{BASE_TOOLS_PATH}/Source/Python/Pkcs7Sign/TestCe= rt.pem > +--other-public-cert=3D{BASE_TOOLS_PATH}/Source/Python/Pkcs7Sign/TestSub.= pub.pem > +--trusted-public-cert=3D{BASE_TOOLS_PATH}/Source/Python/Pkcs7Sign/TestRo= ot.pub.pem > +-o {FMP_CAPSULE_FILE} > +{FMP_CAPSULE_PAYLOAD} > +''' > +MetaInfoXmlTemplate =3D ''' > + > + > + com.intel.FMP_CAPSULE_BASE_NAME.firmware > + FMP_CAPSULE_BASE_NAME > + System firmware for the FMP_CAPSULE_BASE_NAME > + > + Description of System firmware for the FMP_CAPSULE_BASE_NAME > + > + > + FMP_CAPSULE_GUID > + > + http://www.tianocore.org > + CC0-1.0 > + BSD > + Tianocore > + > + > + > + Build FMP_CAPSULE_STRING > + > + > + > + > + > + > + > + > +''' > + > +LvfsDdfTemplate =3D ''' > +.OPTION EXPLICIT ; Generate errors on variable typos > + > +.Set CabinetNameTemplate=3Dfirmware.cab ; The name of the file > +.set DiskDirectoryTemplate=3DCDROM ; All cabinets go in a single directo= ry > +.Set Cabinet=3Don ; > +.Set Compress=3Don ; > +.Set DiskDirectory1=3D. > +.Set MaxDiskSize=3D99999744 ; multiple of 512 > + > +;*** Files to zip ; > +; > +firmware.bin > +firmware.metainfo.xml > +;*** > +''' > + > +def GenCapsuleDevice (BaseName, PayloadFileName, Guid, Version, Lsv, Cap= sulesPath, CapsulesSubDir): > + global gBaseToolsPath > + LogAlways ('Generate Capsule: {0} {1:08x} {2:08x} {3}'.format (Guid,= Version, Lsv, PayloadFileName)) > + > + VersionString =3D '.'.join([str(ord(x)) for x in struct.pack('>I', V= ersion).decode()]) > + > + FmpCapsuleFile =3D NormalizePath ((CapsulesPath, CapsulesSubDir, Bas= eName + '.' + VersionString + '.cap')) > + Command =3D GenerateCapsuleCommand.format ( > + FMP_CAPSULE_GUID =3D Guid, > + FMP_CAPSULE_VERSION =3D Version, > + FMP_CAPSULE_LSV =3D Lsv, > + BASE_TOOLS_PATH =3D gBaseToolsPath, > + FMP_CAPSULE_FILE =3D FmpCapsuleFile, > + FMP_CAPSULE_PAYLOAD =3D PayloadFileName > + ) > + Command =3D ' '.join(Command.splitlines()).strip() > + if gArgs.Verbose: > + Command =3D Command + ' -v' > + > + Log (Command) > + > + Process =3D subprocess.Popen(Command, stdin=3Dsubprocess.PIPE, stdou= t=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3DTrue) > + ProcessOutput =3D Process.communicate() > + > + if Process.returncode =3D=3D 0: > + Log (ProcessOutput[0].decode()) > + else: > + LogAlways (Command) > + LogAlways (ProcessOutput[0].decode()) > + Error ('GenerateCapsule returned an error') > + > + Copy (PayloadFileName, (CapsulesPath, 'firmware.bin')) > + MetaInfoXml =3D MetaInfoXmlTemplate > + MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_GUID', Guid) > + MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_BASE_NAME', BaseNa= me) > + MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_VERSION_DECIMAL', = str(Version)) > + MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_STRING', VersionSt= ring) > + MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_DATE', str(datetim= e.date.today())) > + f =3D open (NormalizePath ((CapsulesPath, 'firmware.metainfo.xml')),= 'w') > + f.write(MetaInfoXml) > + f.close() > + > + f =3D open (NormalizePath ((CapsulesPath, 'Lvfs.ddf')), 'w') > + f.write(LvfsDdfTemplate) > + f.close() > + > + if sys.platform =3D=3D "win32": > + Command =3D 'makecab /f ' + NormalizePath ((CapsulesPath, 'Lvfs.= ddf')) > + else: > + Command =3D 'gcab --create firmware.cab firmware.bin firmware.me= tainfo.xml' > + Log (Command) > + > + Process =3D subprocess.Popen(Command, cwd=3DCapsulesPath, stdin=3Dsu= bprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.PIPE, shell=3D= True) > + ProcessOutput =3D Process.communicate() > + > + if Process.returncode =3D=3D 0: > + Log (ProcessOutput[0].decode()) > + else: > + LogAlways (Command) > + LogAlways (ProcessOutput[0].decode()) > + Error ('GenerateCapsule returned an error') > + > + FmpCabinetFile =3D NormalizePath ((CapsulesPath, CapsulesSubDir, Bas= eName + '.' + VersionString + '.cab')) > + > + Copy ((CapsulesPath, 'firmware.cab'), FmpCabinetFile) > + > + RemoveFile ((CapsulesPath, 'firmware.cab')) > + RemoveFile ((CapsulesPath, 'setup.inf')) > + RemoveFile ((CapsulesPath, 'setup.rpt')) > + RemoveFile ((CapsulesPath, 'Lvfs.ddf')) > + RemoveFile ((CapsulesPath, 'firmware.metainfo.xml')) > + RemoveFile ((CapsulesPath, 'firmware.bin')) > + > +def GenCapsuleSampleDevice (SampleDeviceName, Guid, Version, Lsv, Capsul= esPath, CapsulesSubDir): > + BinaryPayload =3D SampleDeviceName.encode() + bytearray(0x18 - len (= SampleDeviceName.encode())) > + BinaryPayload =3D BinaryPayload + struct.pack(' + BinaryPayload =3D BinaryPayload + struct.pack(' + > + PayloadFileName =3D NormalizePath ((CapsulesPath, SampleDeviceName += '.bin')) > + f =3D open (PayloadFileName, 'wb') > + f.write(BinaryPayload) > + f.close() > + > + GenCapsuleDevice(SampleDeviceName, PayloadFileName, Guid, Version, L= sv, CapsulesPath, CapsulesSubDir) > + > + RemoveFile (PayloadFileName) > + > +if __name__ =3D=3D '__main__': > + # > + # Create command line argument parser object > + # > + parser =3D argparse.ArgumentParser ( > + prog =3D __prog__, > + description =3D __description__ + __copyright__, > + conflict_handler =3D 'resolve' > + ) > + parser.add_argument ( > + '-a', '--arch', dest =3D 'Arch', nargs =3D '+', action =3D = 'append', > + required =3D True, > + help =3D '''ARCHS is one of list: IA32, X64, IPF, ARM, AARC= H64 or EBC, > + which overrides target.txt's TARGET_ARCH definiti= on. To > + specify more archs, please repeat this option.''' > + ) > + parser.add_argument ( > + '-t', '--tagname', dest =3D 'ToolChain', required =3D True, > + help =3D '''Using the Tool Chain Tagname to build the platf= orm, > + overriding target.txt's TOOL_CHAIN_TAG definition= .''' > + ) > + parser.add_argument ( > + '-p', '--platform', dest =3D 'PlatformFile', required =3D T= rue, > + help =3D '''Build the platform specified by the DSC file na= me argument, > + overriding target.txt's ACTIVE_PLATFORM definitio= n.''' > + ) > + parser.add_argument ( > + '-b', '--buildtarget', dest =3D 'BuildTarget', required =3D= True, > + help =3D '''Using the TARGET to build the platform, overrid= ing > + target.txt's TARGET definition.''' > + ) > + parser.add_argument ( > + '--conf=3D', dest =3D 'ConfDirectory', required =3D True, > + help =3D '''Specify the customized Conf directory.''' > + ) > + parser.add_argument ( > + '-D', '--define', dest =3D 'Define', nargs=3D'*', action = =3D 'append', > + help =3D '''Macro: "Name [=3D Value]".''' > + ) > + parser.add_argument ( > + '-v', '--verbose', dest =3D 'Verbose', action =3D 'store_tr= ue', > + help =3D '''Turn on verbose output with informational messa= ges printed''' > + ) > + parser.add_argument ( > + '--package', dest =3D 'Package', nargs =3D '*', action =3D = 'append', > + help =3D '''The directory name of a package of tests to cop= y''' > + ) > + > + # > + # Parse command line arguments > + # > + gArgs, remaining =3D parser.parse_known_args() > + gArgs.BuildType =3D 'all' > + for BuildType in ['all', 'fds', 'genc', 'genmake', 'clean', 'cleanal= l', 'modules', 'libraries', 'run']: > + if BuildType in remaining: > + gArgs.BuildType =3D BuildType > + remaining.remove(BuildType) > + break > + gArgs.Remaining =3D ' '.join(remaining) > + > + # > + # Get WORKSPACE environment variable > + # > + try: > + gWorkspace =3D os.environ['WORKSPACE'] > + except: > + Error ('WORKSPACE environment variable not set') > + > + # > + # Get PACKAGES_PATH and generate prioritized list of paths > + # > + PathList =3D [gWorkspace] > + try: > + PathList +=3D os.environ['PACKAGES_PATH'].split(os.pathsep) > + except: > + pass > + > + # > + # Determine full path to BaseTools > + # > + for Path in PathList: > + if os.path.exists (os.path.join (Path, 'BaseTools')): > + gBaseToolsPath =3D os.path.join (Path, 'BaseTools') > + break > + > + # > + # Parse OUTPUT_DIRECTORY from DSC file > + # > + for Path in PathList: > + if os.path.exists (os.path.join (Path, gArgs.PlatformFile)): > + Dsc =3D open (os.path.join (Path, gArgs.PlatformFile), 'r').= readlines() > + break > + for Line in Dsc: > + if Line.strip().startswith('OUTPUT_DIRECTORY'): > + OutputDirectory =3D Line.strip().split('=3D')[1].strip() > + break > + > + # > + # Determine full paths to EDK II build directory, EDK II build outpu= t > + # directory and the CPU arch of the UEFI phase. > + # > + CommandDir =3D os.path.dirname(sys.argv[0]) > + EdkiiBuildDir =3D os.path.join (gWorkspace, OutputDirectory) > + EdkiiBuildOutput =3D os.path.join (EdkiiBuildDir, gArgs.BuildTarget = + '_' + gArgs.ToolChain) > + UefiArch =3D gArgs.Arch[0][0] > + if len (gArgs.Arch) > 1: > + if ['X64'] in gArgs.Arch: > + UefiArch =3D 'X64' > + > + CapsulesPath =3D NormalizePath((EdkiiBuildDir, 'Capsules')) > + > + CapsulesSubDir =3D 'TestCert' + '_' + UefiArch + '_' + gArgs.BuildTa= rget + '_' + gArgs.ToolChain > + > + # > + # Create output directories > + # > + try: > + CreateDirectory ((CapsulesPath)) > + except: > + pass > + try: > + CreateDirectory ((CapsulesPath, CapsulesSubDir)) > + except: > + pass > + > + # > + # Copy CapsuleApp > + # > + Copy ((EdkiiBuildOutput, UefiArch, 'CapsuleApp.efi'), (CapsulesPath,= CapsulesSubDir)) > + > + # > + # Generate capsules for the Red Sample Device > + # > + GenCapsuleSampleDevice('Red','72E2945A-00DA-448E-9AA7-075AD840F9D4',= 0x00000010,0x00000000, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Red','72E2945A-00DA-448E-9AA7-075AD840F9D4',= 0x00000011,0x00000000, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Red','72E2945A-00DA-448E-9AA7-075AD840F9D4',= 0x00000012,0x00000000, CapsulesPath, CapsulesSubDir) > + > + # > + # Generate capsules for the Green Sample Device > + # > + GenCapsuleSampleDevice('Green','79179BFD-704D-4C90-9E02-0AB8D968C18A= ',0x00000020,0x00000020, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Green','79179BFD-704D-4C90-9E02-0AB8D968C18A= ',0x00000021,0x00000020, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Green','79179BFD-704D-4C90-9E02-0AB8D968C18A= ',0x00000022,0x00000020, CapsulesPath, CapsulesSubDir) > + > + # > + # Generate capsules for the Blue Sample Device > + # > + GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6'= ,0x00000010,0x00000000, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6'= ,0x00000011,0x00000000, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6'= ,0x00000012,0x00000012, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6'= ,0x00000013,0x00000012, CapsulesPath, CapsulesSubDir) > + GenCapsuleSampleDevice('Blue','149DA854-7D19-4FAA-A91E-862EA1324BE6'= ,0x00000014,0x00000012, CapsulesPath, CapsulesSubDir) > + > + # > + # Generate capsules for Minnow Max Firmware Updates > + # > + RomFileName =3D os.path.join (EdkiiBuildOutput, 'FV', 'VLV.fd') > + GenCapsuleDevice('MinnowMax', RomFileName,'4096267B-DA0A-42EB-B5EB-F= EF31D207CB4',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir) > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleAll.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/Ge= nerateCapsule/GenCapsuleAll.sh > deleted file mode 100755 > index 7b77b50c3f..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleAll.sh > +++ /dev/null > @@ -1,33 +0,0 @@ > -# @file > -# Linux script file to generate UEFI capsules for system firmware and > -# firmware for sample devices > -# > -# Copyright (c) 2018, Intel Corporation. All rights reserved.
> -# > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > - > -cd $(dirname $0) > - > -EFI_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/${TARGET}_${TOOL_CHAIN_TAG}= /X64/ > -CAP_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules > -SCRIPT_DIR=3D$WORKSPACE/edk2-platforms/Platform/Intel/Vlv2TbltDevicePkg/= Feature/Capsule/GenerateCapsule > - > -rm -rf $CAP_DIR > -mkdir -p $CAP_DIR/SampleDevelopment > -mkdir -p $CAP_DIR/NewCert > -mkdir -p $CAP_DIR/TestCert > -if [ "$TARGET" =3D=3D "DEBUG" ]; then > - cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleApp.efi > - cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleApp.efi > - cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleApp.efi > - . $SCRIPT_DIR/GenCapsuleMinnowMax.sh > -else > - cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/SampleDevelopment/CapsuleAppRele= ase.efi > - cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/NewCert/CapsuleAppRelease.efi > - cp $EFI_DIR/CapsuleApp.efi $CAP_DIR/TestCert/CapsuleAppRelease.efi > - . $SCRIPT_DIR/GenCapsuleMinnowMaxRelease.sh > -fi > -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Blue 149DA854-7D19-4FAA-A91E-862= EA1324BE6 > -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-9E02-0AB= 8D968C18A > -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red 72E2945A-00DA-448E-9AA7-075= AD840F9D4 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleMinnowMax.bat b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Cap= sule/GenerateCapsule/GenCapsuleMinnowMax.bat > deleted file mode 100644 > index 6e4afd201e..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMax.bat > +++ /dev/null > @@ -1,131 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > - > -set FMP_CAPSULE_VENDOR=3DIntel > -set FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 > -set FMP_CAPSULE_FILE=3DMinnowMax.cap > -set FMP_CAPSULE_VERSION=3D0x0000000C > -set FMP_CAPSULE_STRING=3D0.0.0.12 > -set FMP_CAPSULE_NAME=3D"Intel MinnowMax DEBUG UEFI %FMP_CAPSULE_STRING%" > -set FMP_CAPSULE_LSV=3D0x00000000 > -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > -set FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS20= 15x86\FV\Vlv.ROM > -set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > - > -if not exist "%FMP_CAPSULE_PAYLOAD%" exit /b > - > -if exist "%FMP_CAPSULE_KEY%" ( > - REM > - REM Sign capsule using signtool > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x= 86" ^ > - --pfx-file %FMP_CAPSULE_KEY% ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\S= ampleDevelopment > - > - if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\= Capsules\SampleDevelopment\MinnowMaxWindowsCapsule > - rmdir /s /q WindowsCapsule > - ) > - erase %FMP_CAPSULE_FILE% > -) > - > -if exist "NewCert.pem" ( > - REM > - REM Sign capsule using OpenSSL with a new certificate > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3DNewCert.pem ^ > - --other-public-cert=3DNewSub.pub.pem ^ > - --trusted-public-cert=3DNewRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\N= ewCert > - > - if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\= Capsules\NewCert\MinnowMaxWindowsCapsule > - rmdir /s /q WindowsCapsule > - ) > - erase %FMP_CAPSULE_FILE% > -) > - > -REM > -REM Sign capsule using OpenSSL with EDK II Test Certificate > -REM > -call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestCert.pem ^ > - --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestSub.pub.pem ^ > - --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > -copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Tes= tCert > - > -if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\Ca= psules\TestCert\MinnowMaxWindowsCapsule > - rmdir /s /q WindowsCapsule > -) > - > -erase %FMP_CAPSULE_FILE% > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleMinnowMax.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Caps= ule/GenerateCapsule/GenCapsuleMinnowMax.sh > deleted file mode 100644 > index 114c4a3477..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMax.sh > +++ /dev/null > @@ -1,59 +0,0 @@ > -# @file > -# Linux script file to generate UEFI capsules for system firmware > -# > -# Copyright (c) 2018, Intel Corporation. All rights reserved.
> -# > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > - > -FMP_CAPSULE_VENDOR=3DIntel > -FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 > -FMP_CAPSULE_FILE=3DMinnowMax.cap > -FMP_CAPSULE_VERSION=3D0x0000000C > -FMP_CAPSULE_STRING=3D0.0.0.12 > -FMP_CAPSULE_NAME=3D"Intel MinnowMax DEBUG UEFI $FMP_CAPSULE_STRING" > -FMP_CAPSULE_LSV=3D0x00000000 > -FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/DEBUG_${TOOL_CH= AIN_TAG}/FV/Vlv.ROM > -FMP_CAPSULE_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/ > - > -PKCS7SIGN_DIR=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/ > - > -if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then > - return > -fi > - > -if [ -e NewCert.pem ]; then > - # > - # Sign capsule using OpenSSL with a new certificate > - # > - GenerateCapsule \ > - --encode \ > - -v \ > - --guid $FMP_CAPSULE_GUID \ > - --fw-version $FMP_CAPSULE_VERSION \ > - --lsv $FMP_CAPSULE_LSV \ > - --capflag PersistAcrossReset \ > - --capflag InitiateReset \ > - --signer-private-cert=3DNewCert.pem \ > - --other-public-cert=3DNewSub.pub.pem \ > - --trusted-public-cert=3DNewRoot.pub.pem \ > - -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \ > - $FMP_CAPSULE_PAYLOAD > -fi > - > -# > -# Sign capsule using OpenSSL with EDK II Test Certificate > -# > -GenerateCapsule \ > - --encode \ > - -v \ > - --guid $FMP_CAPSULE_GUID \ > - --fw-version $FMP_CAPSULE_VERSION \ > - --lsv $FMP_CAPSULE_LSV \ > - --capflag PersistAcrossReset \ > - --capflag InitiateReset \ > - --signer-private-cert=3D$PKCS7SIGN_DIR/TestCert.pem \ > - --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ > - --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ > - -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \ > - $FMP_CAPSULE_PAYLOAD > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleMinnowMaxRelease.bat b/Platform/Intel/Vlv2TbltDevicePkg/Feat= ure/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.bat > deleted file mode 100644 > index 43c609e4b2..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMaxRelease.bat > +++ /dev/null > @@ -1,131 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > - > -set FMP_CAPSULE_VENDOR=3DIntel > -set FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 > -set FMP_CAPSULE_FILE=3DMinnowMaxRelease.cap > -set FMP_CAPSULE_VERSION=3D0x0000000C > -set FMP_CAPSULE_STRING=3D0.0.0.12 > -set FMP_CAPSULE_NAME=3D"Intel MinnowMax RELEASE UEFI %FMP_CAPSULE_STRING= %" > -set FMP_CAPSULE_LSV=3D0x00000000 > -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > -set FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS= 2015x86\FV\Vlv.ROM > -set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > - > -if not exist "%FMP_CAPSULE_PAYLOAD%" exit /b > - > -if exist "%FMP_CAPSULE_KEY%" ( > - REM > - REM Sign capsule using signtool > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x= 86" ^ > - --pfx-file %FMP_CAPSULE_KEY% ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\S= ampleDevelopment > - > - if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\= Capsules\SampleDevelopment\MinnowMaxReleaseWindowsCapsule > - rmdir /s /q WindowsCapsule > - ) > - erase %FMP_CAPSULE_FILE% > -) > - > -if exist "NewCert.pem" ( > - REM > - REM Sign capsule using OpenSSL with a new certificate > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3DNewCert.pem ^ > - --other-public-cert=3DNewSub.pub.pem ^ > - --trusted-public-cert=3DNewRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\N= ewCert > - > - if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\= Capsules\NewCert\MinnowMaxReleaseWindowsCapsule > - rmdir /s /q WindowsCapsule > - ) > - erase %FMP_CAPSULE_FILE% > -) > - > -REM > -REM Sign capsule using OpenSSL with EDK II Test Certificate > -REM > -call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestCert.pem ^ > - --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestSub.pub.pem ^ > - --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > -copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Tes= tCert > - > -if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\Ca= psules\TestCert\MinnowMaxReleaseWindowsCapsule > - rmdir /s /q WindowsCapsule > -) > - > -erase %FMP_CAPSULE_FILE% > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleMinnowMaxRelease.sh b/Platform/Intel/Vlv2TbltDevicePkg/Featu= re/Capsule/GenerateCapsule/GenCapsuleMinnowMaxRelease.sh > deleted file mode 100644 > index d2619786e8..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleMinnowMaxRelease.sh > +++ /dev/null > @@ -1,64 +0,0 @@ > -# @file > -# Linux script file to generate UEFI capsules for system firmware > -# > -# Copyright (c) 2018, Intel Corporation. All rights reserved.
> -# > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > - > -FMP_CAPSULE_VENDOR=3DIntel > -FMP_CAPSULE_GUID=3D4096267B-DA0A-42EB-B5EB-FEF31D207CB4 > -FMP_CAPSULE_FILE=3DMinnowMaxRelease.cap > -FMP_CAPSULE_VERSION=3D0x0000000C > -FMP_CAPSULE_STRING=3D0.0.0.12 > -FMP_CAPSULE_NAME=3D"Intel MinnowMax RELEASE UEFI $FMP_CAPSULE_STRING" > -FMP_CAPSULE_LSV=3D0x00000000 > -FMP_CAPSULE_PAYLOAD=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/RELEASE_${TOOL_= CHAIN_TAG}/FV/Vlv.ROM > -FMP_CAPSULE_DIR=3D$WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/ > - > -PKCS7SIGN_DIR=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/ > - > -if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then > - return > -fi > - > -if [ -e NewCert.pem ]; then > - # > - # Sign capsule using OpenSSL with a new certificate > - # > - GenerateCapsule \ > - --encode \ > - -v \ > - --guid $FMP_CAPSULE_GUID \ > - --fw-version $FMP_CAPSULE_VERSION \ > - --lsv $FMP_CAPSULE_LSV \ > - --capflag PersistAcrossReset \ > - --capflag InitiateReset \ > - --signer-private-cert=3DNewCert.pem \ > - --other-public-cert=3DNewSub.pub.pem \ > - --trusted-public-cert=3DNewRoot.pub.pem \ > - -o $FMP_CAPSULE_DIR/NewCert/$FMP_CAPSULE_FILE \ > - $FMP_CAPSULE_PAYLOAD > -fi > - > -# > -# Sign capsule using OpenSSL with EDK II Test Certificate > -# > -GenerateCapsule \ > - --encode \ > - -v \ > - --guid $FMP_CAPSULE_GUID \ > - --fw-version $FMP_CAPSULE_VERSION \ > - --lsv $FMP_CAPSULE_LSV \ > - --capflag PersistAcrossReset \ > - --capflag InitiateReset \ > - --signer-private-cert=3D$PKCS7SIGN_DIR/TestCert.pem \ > - --other-public-cert=3D$PKCS7SIGN_DIR/TestSub.pub.pem \ > - --trusted-public-cert=3D$PKCS7SIGN_DIR/TestRoot.pub.pem \ > - -o $FMP_CAPSULE_DIR/TestCert/$FMP_CAPSULE_FILE \ > - $FMP_CAPSULE_PAYLOAD > - > -cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCer= t > - > -rm $FMP_CAPSULE_FILE > - > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleSampleColor.bat b/Platform/Intel/Vlv2TbltDevicePkg/Feature/C= apsule/GenerateCapsule/GenCapsuleSampleColor.bat > deleted file mode 100644 > index 3e9f94c530..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleSampleColor.bat > +++ /dev/null > @@ -1,137 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for a sample device > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > - > -set COLOR=3D%1 > - > -set FMP_CAPSULE_VENDOR=3DIntel > -set FMP_CAPSULE_GUID=3D%2 > -set FMP_CAPSULE_FILE=3D%COLOR%.cap > -set FMP_CAPSULE_VERSION=3D0x00000010 > -set FMP_CAPSULE_STRING=3D0.0.0.16 > -set FMP_CAPSULE_NAME=3D"%COLOR% Progress Bar %FMP_CAPSULE_STRING%" > -set FMP_CAPSULE_LSV=3D0x00000000 > -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > -set FMP_CAPSULE_PAYLOAD=3DPayload.bin > -set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > - > -echo "%COLOR% Progress Bar" > %FMP_CAPSULE_PAYLOAD% > - > -if not exist "%FMP_CAPSULE_PAYLOAD%" exit > - > -if exist "%FMP_CAPSULE_KEY%" ( > - REM > - REM Sign capsule using signtool > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x= 86" ^ > - --pfx-file %FMP_CAPSULE_KEY% ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\S= ampleDevelopment > - > - if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\= Capsules\SampleDevelopment\%COLOR%WindowsCapsule > - rmdir /s /q WindowsCapsule > - ) > - erase %FMP_CAPSULE_FILE% > -) > - > -if exist "NewCert.pem" ( > - REM > - REM Sign capsule using OpenSSL with a new certificate > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3DNewCert.pem ^ > - --other-public-cert=3DNewSub.pub.pem ^ > - --trusted-public-cert=3DNewRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\N= ewCert > - > - if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\= Capsules\NewCert\%COLOR%WindowsCapsule > - rmdir /s /q WindowsCapsule > - ) > - erase %FMP_CAPSULE_FILE% > -) > - > -REM > -REM Sign capsule using OpenSSL with EDK II Test Certificate > -REM > -call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestCert.pem ^ > - --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestSub.pub.pem ^ > - --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > -copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Tes= tCert > - > -if exist "%WINDOWS_CAPSULE_KEY%" ( > - CreateWindowsCapsule.py ^ > - UEFI ^ > - %FMP_CAPSULE_STRING% ^ > - %FMP_CAPSULE_GUID% ^ > - %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_VERSION% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_VENDOR% ^ > - %FMP_CAPSULE_NAME% %WINDOWS_CAPSULE_KEY% > - > - xcopy /s/e/v/i/y WindowsCapsule %WORKSPACE%\Build\Vlv2TbltDevicePkg\Ca= psules\TestCert\%COLOR%WindowsCapsule > - rmdir /s /q WindowsCapsule > -) > - > -erase %FMP_CAPSULE_FILE% > - > -erase %FMP_CAPSULE_PAYLOAD% > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/GenCapsuleSampleColor.sh b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Ca= psule/GenerateCapsule/GenCapsuleSampleColor.sh > deleted file mode 100644 > index a1c6f28cde..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge= nCapsuleSampleColor.sh > +++ /dev/null > @@ -1,70 +0,0 @@ > -# @file > -# Linux script file to generate UEFI capsules for a sample device > -# > -# Copyright (c) 2018, Intel Corporation. All rights reserved.
> -# > -# SPDX-License-Identifier: BSD-2-Clause-Patent > -# > - > -COLOR=3D$1 > - > -FMP_CAPSULE_VENDOR=3DIntel > -FMP_CAPSULE_GUID=3D$2 > -FMP_CAPSULE_FILE=3D$COLOR.cap > -FMP_CAPSULE_VERSION=3D0x00000010 > -FMP_CAPSULE_STRING=3D0.0.0.16 > -FMP_CAPSULE_NAME=3D"$COLOR Progress Bar $FMP_CAPSULE_STRING" > -FMP_CAPSULE_LSV=3D0x00000000 > -FMP_CAPSULE_PAYLOAD=3DPayload.bin > - > -echo "$COLOR Progress Bar" > $FMP_CAPSULE_PAYLOAD > - > -if [ ! -e "$FMP_CAPSULE_PAYLOAD" ] ; then > - return > -fi > - > -if [ -e NewCert.pem ]; then > - # > - # Sign capsule using OpenSSL with a new certificate > - # > - GenerateCapsule \ > - --encode \ > - -v \ > - --guid $FMP_CAPSULE_GUID \ > - --fw-version $FMP_CAPSULE_VERSION \ > - --lsv $FMP_CAPSULE_LSV \ > - --capflag PersistAcrossReset \ > - --capflag InitiateReset \ > - --signer-private-cert=3DNewCert.pem \ > - --other-public-cert=3DNewSub.pub.pem \ > - --trusted-public-cert=3DNewRoot.pub.pem \ > - -o $FMP_CAPSULE_FILE \ > - $FMP_CAPSULE_PAYLOAD > - > - cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/NewCe= rt > - > - rm $FMP_CAPSULE_FILE > -fi > - > -# > -# Sign capsule using OpenSSL with EDK II Test Certificate > -# > -GenerateCapsule \ > - --encode \ > - -v \ > - --guid $FMP_CAPSULE_GUID \ > - --fw-version $FMP_CAPSULE_VERSION \ > - --lsv $FMP_CAPSULE_LSV \ > - --capflag PersistAcrossReset \ > - --capflag InitiateReset \ > - --signer-private-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7S= ign/TestCert.pem \ > - --other-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sig= n/TestSub.pub.pem \ > - --trusted-public-cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7S= ign/TestRoot.pub.pem \ > - -o $FMP_CAPSULE_FILE \ > - $FMP_CAPSULE_PAYLOAD > - > -cp $FMP_CAPSULE_FILE $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCer= t > - > -rm $FMP_CAPSULE_FILE > - > -rm $FMP_CAPSULE_PAYLOAD > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/Lvfs.ddf b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCa= psule/Lvfs.ddf > deleted file mode 100644 > index f2c925a6dd..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lv= fs.ddf > +++ /dev/null > @@ -1,14 +0,0 @@ > -.OPTION EXPLICIT ; Generate errors on variable typos > - > -.Set CabinetNameTemplate=3Dfirmware.cab ; The name of the file > -.set DiskDirectoryTemplate=3DCDROM ; All cabinets go in a single directo= ry > -.Set Cabinet=3Don ; > -.Set Compress=3Don ; > -.Set DiskDirectory1=3D. > -.Set MaxDiskSize=3D99999744 ; multiple of 512 > - > -;*** Files to zip ; > -; > -firmware.bin > -firmware.metainfo.xml > -;*** > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/LvfsGenCapsuleMinnowMax.bat b/Platform/Intel/Vlv2TbltDevicePkg/Feature= /Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMax.bat > deleted file mode 100644 > index dd8274a1cc..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lv= fsGenCapsuleMinnowMax.bat > +++ /dev/null > @@ -1,139 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM > -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > - > -set FMP_CAPSULE_VENDOR=3DIntel > -set FMP_CAPSULE_GUID=3D4096267b-da0a-42eb-b5eb-fef31d207cb4 > -set FMP_CAPSULE_BASE_NAME=3DMinnowMax > -set FMP_CAPSULE_FILE=3D%FMP_CAPSULE_BASE_NAME%.cap > -set FMP_CAPSULE_VERSION=3D0x0000000C > -set FMP_CAPSULE_VERSION_DECIMAL=3D12 > -set FMP_CAPSULE_STRING=3D0.0.0.12 > -set FMP_CAPSULE_NAME=3D"Intel %FMP_CAPSULE_BASE_NAME% DEBUG UEFI %FMP_CA= PSULE_STRING%" > -set FMP_CAPSULE_LSV=3D0x00000000 > -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > -set FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS20= 15x86\FV\Vlv.ROM > -set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > - > -if not exist "%FMP_CAPSULE_PAYLOAD%" exit /b > - > -if exist "%FMP_CAPSULE_KEY%" ( > - REM > - REM Sign capsule using signtool > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x= 86" ^ > - --pfx-file %FMP_CAPSULE_KEY% ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\S= ampleDevelopment > - > - copy %FMP_CAPSULE_FILE% firmware.bin > - copy template.metainfo.xml firmware.metainfo.xml > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= GUID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCI= I" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -enc= oding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= VERSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metai= nfo.xml -encoding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= STRING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding = ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= DATE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > - makecab /f Lvfs.ddf > - copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCer= t\%FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > - erase firmware.cab > - erase setup.inf > - erase setup.rpt > - > - erase firmware.metainfo.xml > - erase firmware.bin > - erase %FMP_CAPSULE_FILE% > -) > - > -if exist "NewCert.pem" ( > - REM > - REM Sign capsule using OpenSSL with a new certificate > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3DNewCert.pem ^ > - --other-public-cert=3DNewSub.pub.pem ^ > - --trusted-public-cert=3DNewRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\N= ewCert > - > - copy %FMP_CAPSULE_FILE% firmware.bin > - copy template.metainfo.xml firmware.metainfo.xml > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= GUID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCI= I" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -enc= oding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= VERSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metai= nfo.xml -encoding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= STRING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding = ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= DATE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > - makecab /f Lvfs.ddf > - copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCer= t\%FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > - erase firmware.cab > - erase setup.inf > - erase setup.rpt > - > - erase firmware.metainfo.xml > - erase firmware.bin > - erase %FMP_CAPSULE_FILE% > -) > - > -REM > -REM Sign capsule using OpenSSL with EDK II Test Certificate > -REM > -call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestCert.pem ^ > - --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestSub.pub.pem ^ > - --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > -copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Tes= tCert > - > -copy %FMP_CAPSULE_FILE% firmware.bin > -copy template.metainfo.xml firmware.metainfo.xml > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > -makecab /f Lvfs.ddf > -copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > -erase firmware.cab > -erase setup.inf > -erase setup.rpt > - > -erase firmware.metainfo.xml > -erase firmware.bin > -erase %FMP_CAPSULE_FILE% > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/LvfsGenCapsuleMinnowMaxRelease.bat b/Platform/Intel/Vlv2TbltDevicePkg/= Feature/Capsule/GenerateCapsule/LvfsGenCapsuleMinnowMaxRelease.bat > deleted file mode 100644 > index 2b68a98f98..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lv= fsGenCapsuleMinnowMaxRelease.bat > +++ /dev/null > @@ -1,139 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for system firmware > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM > -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > - > -set FMP_CAPSULE_VENDOR=3DIntel > -set FMP_CAPSULE_GUID=3D4096267b-da0a-42eb-b5eb-fef31d207cb4 > -set FMP_CAPSULE_BASE_NAME=3DMinnowMaxRelease > -set FMP_CAPSULE_FILE=3D%FMP_CAPSULE_BASE_NAME%.cap > -set FMP_CAPSULE_VERSION=3D0x0000000C > -set FMP_CAPSULE_VERSION_DECIMAL=3D12 > -set FMP_CAPSULE_STRING=3D0.0.0.12 > -set FMP_CAPSULE_NAME=3D"Intel %FMP_CAPSULE_BASE_NAME% RELEASE UEFI %FMP_= CAPSULE_STRING%" > -set FMP_CAPSULE_LSV=3D0x00000000 > -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > -set FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS= 2015x86\FV\Vlv.ROM > -set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > - > -if not exist "%FMP_CAPSULE_PAYLOAD%" exit /b > - > -if exist "%FMP_CAPSULE_KEY%" ( > - REM > - REM Sign capsule using signtool > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x= 86" ^ > - --pfx-file %FMP_CAPSULE_KEY% ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\S= ampleDevelopment > - > - copy %FMP_CAPSULE_FILE% firmware.bin > - copy template.metainfo.xml firmware.metainfo.xml > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= GUID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCI= I" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -enc= oding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= VERSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metai= nfo.xml -encoding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= STRING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding = ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= DATE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > - makecab /f Lvfs.ddf > - copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCer= t\%FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > - erase firmware.cab > - erase setup.inf > - erase setup.rpt > - > - erase firmware.metainfo.xml > - erase firmware.bin > - erase %FMP_CAPSULE_FILE% > -) > - > -if exist "NewCert.pem" ( > - REM > - REM Sign capsule using OpenSSL with a new certificate > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3DNewCert.pem ^ > - --other-public-cert=3DNewSub.pub.pem ^ > - --trusted-public-cert=3DNewRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\N= ewCert > - > - copy %FMP_CAPSULE_FILE% firmware.bin > - copy template.metainfo.xml firmware.metainfo.xml > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= GUID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCI= I" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -enc= oding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= VERSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metai= nfo.xml -encoding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= STRING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding = ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= DATE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > - makecab /f Lvfs.ddf > - copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCer= t\%FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > - erase firmware.cab > - erase setup.inf > - erase setup.rpt > - > - erase firmware.metainfo.xml > - erase firmware.bin > - erase %FMP_CAPSULE_FILE% > -) > - > -REM > -REM Sign capsule using OpenSSL with EDK II Test Certificate > -REM > -call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestCert.pem ^ > - --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestSub.pub.pem ^ > - --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > -copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Tes= tCert > - > -copy %FMP_CAPSULE_FILE% firmware.bin > -copy template.metainfo.xml firmware.metainfo.xml > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > -makecab /f Lvfs.ddf > -copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > -erase firmware.cab > -erase setup.inf > -erase setup.rpt > - > -erase firmware.metainfo.xml > -erase firmware.bin > -erase %FMP_CAPSULE_FILE% > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/LvfsGenCapsuleSampleColor.bat b/Platform/Intel/Vlv2TbltDevicePkg/Featu= re/Capsule/GenerateCapsule/LvfsGenCapsuleSampleColor.bat > deleted file mode 100644 > index 1dbbe7341d..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lv= fsGenCapsuleSampleColor.bat > +++ /dev/null > @@ -1,145 +0,0 @@ > -@REM @file > -@REM Windows batch file to generate UEFI capsules for a sample device > -@REM > -@REM Copyright (c) 2018, Intel Corporation. All rights reserved.
> -@REM > -@REM SPDX-License-Identifier: BSD-2-Clause-Patent > -@REM > - > -@echo off > -setlocal > - > -set COLOR=3D%1 > - > -set FMP_CAPSULE_VENDOR=3DIntel > -set FMP_CAPSULE_GUID=3D%2 > -set FMP_CAPSULE_BASE_NAME=3D%COLOR% > -set FMP_CAPSULE_FILE=3D%FMP_CAPSULE_BASE_NAME%.cap > -set FMP_CAPSULE_VERSION=3D0x00000010 > -set FMP_CAPSULE_VERSION_DECIMAL=3D16 > -set FMP_CAPSULE_STRING=3D0.0.0.16 > -set FMP_CAPSULE_NAME=3D"%FMP_CAPSULE_BASE_NAME% Progress Bar %FMP_CAPSUL= E_STRING%" > -set FMP_CAPSULE_LSV=3D0x00000000 > -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > -set FMP_CAPSULE_PAYLOAD=3DPayload.bin > -set WINDOWS_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx > - > -echo "%COLOR% Progress Bar" > %FMP_CAPSULE_PAYLOAD% > - > -if not exist "%FMP_CAPSULE_PAYLOAD%" exit > - > -if exist "%FMP_CAPSULE_KEY%" ( > - REM > - REM Sign capsule using signtool > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signing-tool-path=3D"c:\Program Files (x86)\Windows Kits\8.1\bin\x= 86" ^ > - --pfx-file %FMP_CAPSULE_KEY% ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\S= ampleDevelopment > - > - copy %FMP_CAPSULE_FILE% firmware.bin > - copy template.metainfo.xml firmware.metainfo.xml > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= GUID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCI= I" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -enc= oding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= VERSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metai= nfo.xml -encoding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= STRING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding = ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= DATE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > - makecab /f Lvfs.ddf > - copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCer= t\%FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > - erase firmware.cab > - erase setup.inf > - erase setup.rpt > - > - erase firmware.metainfo.xml > - erase firmware.bin > - erase %FMP_CAPSULE_FILE% > -) > - > -if exist "NewCert.pem" ( > - REM > - REM Sign capsule using OpenSSL with a new certificate > - REM > - call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3DNewCert.pem ^ > - --other-public-cert=3DNewSub.pub.pem ^ > - --trusted-public-cert=3DNewRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > - copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\N= ewCert > - > - copy %FMP_CAPSULE_FILE% firmware.bin > - copy template.metainfo.xml firmware.metainfo.xml > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= GUID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCI= I" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -enc= oding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= VERSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metai= nfo.xml -encoding ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= STRING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding = ASCII" > - powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_= DATE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > - makecab /f Lvfs.ddf > - copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCer= t\%FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > - erase firmware.cab > - erase setup.inf > - erase setup.rpt > - > - erase firmware.metainfo.xml > - erase firmware.bin > - erase %FMP_CAPSULE_FILE% > -) > - > -REM > -REM Sign capsule using OpenSSL with EDK II Test Certificate > -REM > -call GenerateCapsule ^ > - --encode ^ > - -v ^ > - --guid %FMP_CAPSULE_GUID% ^ > - --fw-version %FMP_CAPSULE_VERSION% ^ > - --lsv %FMP_CAPSULE_LSV% ^ > - --capflag PersistAcrossReset ^ > - --capflag InitiateReset ^ > - --signer-private-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestCert.pem ^ > - --other-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Si= gn\TestSub.pub.pem ^ > - --trusted-public-cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7= Sign\TestRoot.pub.pem ^ > - -o %FMP_CAPSULE_FILE% ^ > - %FMP_CAPSULE_PAYLOAD% > - > -copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\Tes= tCert > - > -copy %FMP_CAPSULE_FILE% firmware.bin > -copy template.metainfo.xml firmware.metainfo.xml > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_GU= ID', '%FMP_CAPSULE_GUID%' | Out-File firmware.metainfo.xml -encoding ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_BA= SE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File firmware.metainfo.xml -encod= ing ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_VE= RSION_DECIMAL', '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainf= o.xml -encoding ASCII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_ST= RING', '%FMP_CAPSULE_STRING%' | Out-File firmware.metainfo.xml -encoding AS= CII" > -powershell -Command "(gc firmware.metainfo.xml) -replace 'FMP_CAPSULE_DA= TE', '%date%' | Out-File firmware.metainfo.xml -encoding ASCII" > -makecab /f Lvfs.ddf > -copy firmware.cab %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\= %FMP_CAPSULE_BASE_NAME%-%FMP_CAPSULE_STRING%.cab > - > -erase firmware.cab > -erase setup.inf > -erase setup.rpt > - > -erase firmware.metainfo.xml > -erase firmware.bin > -erase %FMP_CAPSULE_FILE% > - > -erase %FMP_CAPSULE_PAYLOAD% > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCap= sule/template.metainfo.xml b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsu= le/GenerateCapsule/template.metainfo.xml > deleted file mode 100644 > index 5d550c1f48..0000000000 > --- a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/te= mplate.metainfo.xml > +++ /dev/null > @@ -1,27 +0,0 @@ > - > - > - com.intel.FMP_CAPSULE_BASE_NAME.firmware > - FMP_CAPSULE_BASE_NAME > - System firmware for the FMP_CAPSULE_BASE_NAME > - > - Description of System firmware for the FMP_CAPSULE_BASE_NAME > - > - > - FMP_CAPSULE_GUID > - > - http://www.tianocore.org > - CC0-1.0 > - BSD > - Tianocore > - > - > - > - Build FMP_CAPSULE_STRING > - > - > - > - > - > - > - > - > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc b/P= latform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc > index bcac59f00a..246347b8fa 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc > @@ -17,7 +17,7 @@ [Defines] > SUPPORTED_ARCHITECTURES =3D IA32|X64 > BUILD_TARGETS =3D DEBUG|RELEASE > SKUID_IDENTIFIER =3D DEFAULT > - POSTBUILD =3D Vlv2TbltDevicePkg/Feature/Capsule/G= enerateCapsule/GenCapsuleAll.sh > + POSTBUILD =3D python Vlv2TbltDevicePkg/Feature/Ca= psule/GenerateCapsule/GenCapsuleAll.py > =20 > ########################################################################= ########################### > # > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc b/Pl= atform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc > index 11d50666c0..68bde30f83 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc > @@ -17,7 +17,7 @@ [Defines] > SUPPORTED_ARCHITECTURES =3D IA32|X64 > BUILD_TARGETS =3D DEBUG|RELEASE > SKUID_IDENTIFIER =3D DEFAULT > - POSTBUILD =3D Vlv2TbltDevicePkg/Feature/Capsule/G= enerateCapsule/GenCapsuleAll.bat > + POSTBUILD =3D python Vlv2TbltDevicePkg/Feature/Ca= psule/GenerateCapsule/GenCapsuleAll.py > =20 > ########################################################################= ########################### > # > --=20 > 2.21.0.windows.1 >=20 >=20