From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: zailiang.sun@intel.com)
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
 by groups.io with SMTP; Thu, 18 Jul 2019 20:19:14 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
  by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jul 2019 20:19:13 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.64,280,1559545200"; 
   d="scan'208";a="343571874"
Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205])
  by orsmga005.jf.intel.com with ESMTP; 18 Jul 2019 20:19:12 -0700
Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by
 fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Thu, 18 Jul 2019 20:19:12 -0700
Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by
 FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Thu, 18 Jul 2019 20:19:11 -0700
Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by
 SHSMSX103.ccr.corp.intel.com ([169.254.4.109]) with mapi id 14.03.0439.000;
 Fri, 19 Jul 2019 11:19:09 +0800
From: "Sun, Zailiang" <zailiang.sun@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>, "Kinney, Michael D"
	<michael.d.kinney@intel.com>
CC: "Qian, Yi" <yi.qian@intel.com>, Gary Lin <glin@suse.com>
Subject: Re: [edk2-devel] [edk2-platforms Patch 4/5] Vlv2TbltDevicePkg: Convert BAT/sh Capsule scripts to Python
Thread-Topic: [edk2-devel] [edk2-platforms Patch 4/5] Vlv2TbltDevicePkg:
 Convert BAT/sh Capsule scripts to Python
Thread-Index: AQHVPbygpGkomSzsWEWmFU3252eiQ6bRRfdw
Date: Fri, 19 Jul 2019 03:19:09 +0000
Message-ID: <7CB7EF03E15B5D48981329A508747A9850C982A6@SHSMSX104.ccr.corp.intel.com>
References: <20190718230017.14852-1-michael.d.kinney@intel.com>
 <20190718230017.14852-5-michael.d.kinney@intel.com>
In-Reply-To: <20190718230017.14852-5-michael.d.kinney@intel.com>
Accept-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [10.239.127.40]
MIME-Version: 1.0
Return-Path: zailiang.sun@intel.com
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Reviewed-By: Zailiang Sun <zailiang.sun@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Michael D Kinney
> Sent: Friday, July 19, 2019 7:00 AM
> To: devel@edk2.groups.io
> Cc: Sun, Zailiang <zailiang.sun@intel.com>; Qian, Yi <yi.qian@intel.com>=
;
> Gary Lin <glin@suse.com>
> Subject: [edk2-devel] [edk2-platforms Patch 4/5] Vlv2TbltDevicePkg: Conv=
ert
> BAT/sh Capsule scripts to Python
>=20
> Convert all the BAT/sh files used to generate capsules to
> OS independent Python script.
>=20
> Cc: Zailiang Sun <zailiang.sun@intel.com>
> Cc: Yi Qian <yi.qian@intel.com>
> Cc: Gary Lin <glin@suse.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  .../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/GenerateCapsule/GenC
> apsuleAll.bat
>  create mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleAll.py
>  delete mode 100755
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleAll.sh
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleMinnowMax.bat
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleMinnowMax.sh
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleMinnowMaxRelease.bat
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleMinnowMaxRelease.sh
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleSampleColor.bat
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenC
> apsuleSampleColor.sh
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs.d
> df
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG
> enCapsuleMinnowMax.bat
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG
> enCapsuleMinnowMaxRelease.bat
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/LvfsG
> enCapsuleSampleColor.bat
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/templ
> ate.metainfo.xml
>=20
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleAll.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleAll.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.<BR>
> -@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\SampleDevelopm
> ent
> -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert
> -mkdir %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert
> -
> copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\Cap
> suleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDeve
> lopment\CapsuleApp.efi
> -
> copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\Ca
> psuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\SampleDev
> elopment\CapsuleAppRelease.efi
> -
> copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\Cap
> suleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\Ca
> psuleApp.efi
> -
> copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\Ca
> psuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\NewCert\C
> apsuleAppRelease.efi
> -
> copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG_VS2015x86\X64\Cap
> suleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\Ca
> psuleApp.efi
> -
> copy %WORKSPACE%\Build\Vlv2TbltDevicePkg\RELEASE_VS2015x86\X64\Ca
> psuleApp.efi %WORKSPACE%\Build\Vlv2TbltDevicePkg\Capsules\TestCert\C
> apsuleAppRelease.efi
> -
> -call GenCapsuleMinnowMax.bat
> -call GenCapsuleMinnowMaxRelease.bat
> -call GenCapsuleSampleColor.bat Blue  149da854-7d19-4faa-a91e-
> 862ea1324be6
> -call GenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-
> 0ab8d968c18a
> -call GenCapsuleSampleColor.bat Red   72e2945a-00da-448e-9aa7-
> 075ad840f9d4
> -
> -call LvfsGenCapsuleMinnowMax.bat
> -call LvfsGenCapsuleMinnowMaxRelease.bat
> -call LvfsGenCapsuleSampleColor.bat Blue  149da854-7d19-4faa-a91e-
> 862ea1324be6
> -call LvfsGenCapsuleSampleColor.bat Green 79179bfd-704d-4c90-9e02-
> 0ab8d968c18a
> -call LvfsGenCapsuleSampleColor.bat Red   72e2945a-00da-448e-9aa7-
> 075ad840f9d4
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleAll.py
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleAll.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.<BR>
> +#
> +# 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 =
reserved.'
> +__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/TestCert.pem
> +--other-public-
> cert=3D{BASE_TOOLS_PATH}/Source/Python/Pkcs7Sign/TestSub.pub.pem
> +--trusted-public-
> cert=3D{BASE_TOOLS_PATH}/Source/Python/Pkcs7Sign/TestRoot.pub.pem
> +-o {FMP_CAPSULE_FILE}
> +{FMP_CAPSULE_PAYLOAD}
> +'''
> +MetaInfoXmlTemplate =3D '''
> +<?xml version=3D"1.0" encoding=3D"UTF-8"?>
> +<component type=3D"firmware">
> +  <id>com.intel.FMP_CAPSULE_BASE_NAME.firmware</id>
> +  <name>FMP_CAPSULE_BASE_NAME</name>
> +  <summary>System firmware for the
> FMP_CAPSULE_BASE_NAME</summary>
> +  <description>
> +    Description of System firmware for the FMP_CAPSULE_BASE_NAME
> +  </description>
> +  <provides>
> +    <firmware type=3D"flashed">FMP_CAPSULE_GUID</firmware>
> +  </provides>
> +  <url type=3D"homepage">http://www.tianocore.org</url>
> +  <metadata_license>CC0-1.0</metadata_license>
> +  <project_license>BSD</project_license>
> +  <developer_name>Tianocore</developer_name>
> +  <releases>
> +    <release version=3D"FMP_CAPSULE_VERSION_DECIMAL"
> date=3D"FMP_CAPSULE_DATE">
> +      <description>
> +        Build FMP_CAPSULE_STRING
> +      </description>
> +    </release>
> +  </releases>
> +  <!-- most OEMs do not need to do this... -->
> +  <custom>
> +    <value key=3D"LVFS::InhibitDownload"/>
> +  </custom>
> +</component>
> +'''
> +
> +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 direct=
ory
> +.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,
> CapsulesPath, 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',
> Version).decode()])
> +
> +    FmpCapsuleFile =3D NormalizePath ((CapsulesPath, CapsulesSubDir,
> BaseName + '.' + 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,
> stdout=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',
> BaseName)
> +    MetaInfoXml =3D MetaInfoXml.replace
> ('FMP_CAPSULE_VERSION_DECIMAL', str(Version))
> +    MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_STRING',
> VersionString)
> +    MetaInfoXml =3D MetaInfoXml.replace ('FMP_CAPSULE_DATE',
> str(datetime.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.metainfo.xml'
> +    Log (Command)
> +
> +    Process =3D subprocess.Popen(Command, cwd=3DCapsulesPath,
> stdin=3Dsubprocess.PIPE, stdout=3Dsubprocess.PIPE, stderr=3Dsubprocess.P=
IPE,
> 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')
> +
> +    FmpCabinetFile =3D NormalizePath ((CapsulesPath, CapsulesSubDir,
> BaseName + '.' + 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,
> CapsulesPath, CapsulesSubDir):
> +    BinaryPayload =3D SampleDeviceName.encode() + bytearray(0x18 - len
> (SampleDeviceName.encode()))
> +    BinaryPayload =3D BinaryPayload + struct.pack('<I', Version)
> +    BinaryPayload =3D BinaryPayload + struct.pack('<I', Lsv)
> +
> +    PayloadFileName =3D NormalizePath ((CapsulesPath, SampleDeviceName =
+
> '.bin'))
> +    f =3D open (PayloadFileName, 'wb')
> +    f.write(BinaryPayload)
> +    f.close()
> +
> +    GenCapsuleDevice(SampleDeviceName, PayloadFileName, Guid, Version,
> Lsv, 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, AAR=
CH64 or EBC,
> +                       which overrides target.txt's TARGET_ARCH definit=
ion. 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 plat=
form,
> +                       overriding target.txt's TOOL_CHAIN_TAG definitio=
n.'''
> +             )
> +    parser.add_argument (
> +             '-p', '--platform', dest =3D 'PlatformFile', required =3D =
True,
> +             help =3D '''Build the platform specified by the DSC file n=
ame argument,
> +                       overriding target.txt's ACTIVE_PLATFORM definiti=
on.'''
> +             )
> +    parser.add_argument (
> +             '-b', '--buildtarget', dest =3D 'BuildTarget', required =
=3D True,
> +             help =3D '''Using the TARGET to build the platform, overri=
ding
> +                       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_t=
rue',
> +             help =3D '''Turn on verbose output with informational mess=
ages
> printed'''
> +             )
> +    parser.add_argument (
> +             '--package', dest =3D 'Package', nargs =3D '*', action =3D=
 'append',
> +             help =3D '''The directory name of a package of tests to co=
py'''
> +             )
> +
> +    #
> +    # Parse command line arguments
> +    #
> +    gArgs, remaining =3D parser.parse_known_args()
> +    gArgs.BuildType =3D 'all'
> +    for BuildType in ['all', 'fds', 'genc', 'genmake', 'clean', 'cleana=
ll', '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 outp=
ut
> +    # 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.BuildT=
arget + '_' +
> 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-FEF31D207CB4',0x0000000C,0x00000000, CapsulesPath, CapsulesSubDir)
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleAll.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleAll.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.<BR>
> -#
> -# 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/GenerateCap
> sule
> -
> -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/CapsuleAppRelease.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-862EA1324BE6
> -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Green 79179BFD-704D-4C90-
> 9E02-0AB8D968C18A
> -. $SCRIPT_DIR/GenCapsuleSampleColor.sh Red   72E2945A-00DA-448E-
> 9AA7-075AD840F9D4
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMax.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMax.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.<BR>
> -@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
> _VS2015x86\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\=
x86" ^
> -    --pfx-file %FMP_CAPSULE_KEY% ^
> -    -o %FMP_CAPSULE_FILE% ^
> -    %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\SampleDevelopment
> -
> -  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\Sampl
> eDevelopment\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\Caps
> ules\NewCert
> -
> -  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\NewC
> ert\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\Pkcs7Sign\TestCert.p
> em ^
> -  --other-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
> -  --trusted-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> -  -o %FMP_CAPSULE_FILE% ^
> -  %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\TestCert
> -
> -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\TestCe
> rt\MinnowMaxWindowsCapsule
> -  rmdir /s /q WindowsCapsule
> -)
> -
> -erase %FMP_CAPSULE_FILE%
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMax.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMax.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.<BR>
> -#
> -# 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_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
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMaxRelease.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMaxRelease.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.<BR>
> -@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\RELEAS
> E_VS2015x86\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\=
x86" ^
> -    --pfx-file %FMP_CAPSULE_KEY% ^
> -    -o %FMP_CAPSULE_FILE% ^
> -    %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\SampleDevelopment
> -
> -  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\Sampl
> eDevelopment\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\Caps
> ules\NewCert
> -
> -  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\NewC
> ert\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\Pkcs7Sign\TestCert.p
> em ^
> -  --other-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
> -  --trusted-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> -  -o %FMP_CAPSULE_FILE% ^
> -  %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\TestCert
> -
> -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\TestCe
> rt\MinnowMaxReleaseWindowsCapsule
> -  rmdir /s /q WindowsCapsule
> -)
> -
> -erase %FMP_CAPSULE_FILE%
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMaxRelease.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleMinnowMaxRelease.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.<BR>
> -#
> -# 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/TestCert
> -
> -rm $FMP_CAPSULE_FILE
> -
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleSampleColor.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleSampleColor.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.<BR>
> -@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\=
x86" ^
> -    --pfx-file %FMP_CAPSULE_KEY% ^
> -    -o %FMP_CAPSULE_FILE% ^
> -    %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\SampleDevelopment
> -
> -  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\Sampl
> eDevelopment\%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\Caps
> ules\NewCert
> -
> -  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\NewC
> ert\%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\Pkcs7Sign\TestCert.p
> em ^
> -  --other-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
> -  --trusted-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> -  -o %FMP_CAPSULE_FILE% ^
> -  %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\TestCert
> -
> -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\TestCe
> rt\%COLOR%WindowsCapsule
> -  rmdir /s /q WindowsCapsule
> -)
> -
> -erase %FMP_CAPSULE_FILE%
> -
> -erase %FMP_CAPSULE_PAYLOAD%
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleSampleColor.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Ge
> nCapsuleSampleColor.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.<BR>
> -#
> -# 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/NewCert
> -
> -  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/Pkcs7Sign/TestCert.pe
> m \
> -  --other-public-
> cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestSub.pub.
> pem \
> -  --trusted-public-
> cert=3D$WORKSPACE/edk2/BaseTools/Source/Python/Pkcs7Sign/TestRoot.pu
> b.pem \
> -  -o $FMP_CAPSULE_FILE \
> -  $FMP_CAPSULE_PAYLOAD
> -
> -cp $FMP_CAPSULE_FILE
> $WORKSPACE/Build/Vlv2TbltDevicePkg/Capsules/TestCert
> -
> -rm $FMP_CAPSULE_FILE
> -
> -rm $FMP_CAPSULE_PAYLOAD
> diff --git
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> .ddf
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> .ddf
> deleted file mode 100644
> index f2c925a6dd..0000000000
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> .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 direct=
ory
> -.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/GenerateCapsule/Lvfs
> GenCapsuleMinnowMax.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> GenCapsuleMinnowMax.bat
> deleted file mode 100644
> index dd8274a1cc..0000000000
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> GenCapsuleMinnowMax.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.<BR>
> -@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_CAPSULE_STRING%"
> -set FMP_CAPSULE_LSV=3D0x00000000
> -set FMP_CAPSULE_KEY=3DSAMPLE_DEVELOPMENT.pfx
> -set
> FMP_CAPSULE_PAYLOAD=3D%WORKSPACE%\Build\Vlv2TbltDevicePkg\DEBUG
> _VS2015x86\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\=
x86" ^
> -    --pfx-file %FMP_CAPSULE_KEY% ^
> -    -o %FMP_CAPSULE_FILE% ^
> -    %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\SampleDevelopment
> -
> -  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 ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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%
> -)
> -
> -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\Caps
> ules\NewCert
> -
> -  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 ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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%
> -)
> -
> -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\Pkcs7Sign\TestCert.p
> em ^
> -  --other-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
> -  --trusted-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> -  -o %FMP_CAPSULE_FILE% ^
> -  %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\TestCert
> -
> -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 ASCII"
> -powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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/GenerateCapsule/Lvfs
> GenCapsuleMinnowMaxRelease.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> GenCapsuleMinnowMaxRelease.bat
> deleted file mode 100644
> index 2b68a98f98..0000000000
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> GenCapsuleMinnowMaxRelease.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.<BR>
> -@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\RELEAS
> E_VS2015x86\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\=
x86" ^
> -    --pfx-file %FMP_CAPSULE_KEY% ^
> -    -o %FMP_CAPSULE_FILE% ^
> -    %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\SampleDevelopment
> -
> -  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 ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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%
> -)
> -
> -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\Caps
> ules\NewCert
> -
> -  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 ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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%
> -)
> -
> -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\Pkcs7Sign\TestCert.p
> em ^
> -  --other-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
> -  --trusted-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> -  -o %FMP_CAPSULE_FILE% ^
> -  %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\TestCert
> -
> -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 ASCII"
> -powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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/GenerateCapsule/Lvfs
> GenCapsuleSampleColor.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> GenCapsuleSampleColor.bat
> deleted file mode 100644
> index 1dbbe7341d..0000000000
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/Lvfs
> GenCapsuleSampleColor.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.<BR>
> -@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_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\=
x86" ^
> -    --pfx-file %FMP_CAPSULE_KEY% ^
> -    -o %FMP_CAPSULE_FILE% ^
> -    %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\SampleDevelopment
> -
> -  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 ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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%
> -)
> -
> -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\Caps
> ules\NewCert
> -
> -  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 ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -  powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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%
> -)
> -
> -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\Pkcs7Sign\TestCert.p
> em ^
> -  --other-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestSub.p
> ub.pem ^
> -  --trusted-public-
> cert=3D%WORKSPACE%\edk2\BaseTools\Source\Python\Pkcs7Sign\TestRoot.
> pub.pem ^
> -  -o %FMP_CAPSULE_FILE% ^
> -  %FMP_CAPSULE_PAYLOAD%
> -
> -
> copy %FMP_CAPSULE_FILE% %WORKSPACE%\Build\Vlv2TbltDevicePkg\Caps
> ules\TestCert
> -
> -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 ASCII"
> -powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_BASE_NAME', '%FMP_CAPSULE_BASE_NAME%' | Out-File
> firmware.metainfo.xml -encoding ASCII"
> -powershell -Command "(gc firmware.metainfo.xml) -replace
> 'FMP_CAPSULE_VERSION_DECIMAL',
> '%FMP_CAPSULE_VERSION_DECIMAL%' | Out-File firmware.metainfo.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\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/GenerateCapsule/tem
> plate.metainfo.xml
> b/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/te
> mplate.metainfo.xml
> deleted file mode 100644
> index 5d550c1f48..0000000000
> ---
> a/Platform/Intel/Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/tem
> plate.metainfo.xml
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -<?xml version=3D"1.0" encoding=3D"UTF-8"?>
> -<component type=3D"firmware">
> -  <id>com.intel.FMP_CAPSULE_BASE_NAME.firmware</id>
> -  <name>FMP_CAPSULE_BASE_NAME</name>
> -  <summary>System firmware for the
> FMP_CAPSULE_BASE_NAME</summary>
> -  <description>
> -    Description of System firmware for the FMP_CAPSULE_BASE_NAME
> -  </description>
> -  <provides>
> -    <firmware type=3D"flashed">FMP_CAPSULE_GUID</firmware>
> -  </provides>
> -  <url type=3D"homepage">http://www.tianocore.org</url>
> -  <metadata_license>CC0-1.0</metadata_license>
> -  <project_license>BSD</project_license>
> -  <developer_name>Tianocore</developer_name>
> -  <releases>
> -    <release version=3D"FMP_CAPSULE_VERSION_DECIMAL"
> date=3D"FMP_CAPSULE_DATE">
> -      <description>
> -        Build FMP_CAPSULE_STRING
> -      </description>
> -    </release>
> -  </releases>
> -  <!-- most OEMs do not need to do this... -->
> -  <custom>
> -    <value key=3D"LVFS::InhibitDownload"/>
> -  </custom>
> -</component>
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleIA32.dsc
> b/Platform/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/GenerateCapsule/GenCapsuleAll.sh
> +  POSTBUILD                      =3D python
> Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py
>=20
>=20
> ##########################################################
> #########################################
>  #
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformCapsuleX64.dsc
> b/Platform/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/GenerateCapsule/GenCapsuleAll.bat
> +  POSTBUILD                      =3D python
> Vlv2TbltDevicePkg/Feature/Capsule/GenerateCapsule/GenCapsuleAll.py
>=20
>=20
> ##########################################################
> #########################################
>  #
> --
> 2.21.0.windows.1
>=20
>=20
>=20