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.24, mailfrom: zailiang.sun@intel.com)
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by groups.io with SMTP; Wed, 10 Jul 2019 21:55:26 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga008.fm.intel.com ([10.253.24.58])
  by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 21:55:25 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.63,476,1557212400"; 
   d="scan'208";a="166282469"
Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202])
  by fmsmga008.fm.intel.com with ESMTP; 10 Jul 2019 21:55:25 -0700
Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by
 fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS)
 id 14.3.439.0; Wed, 10 Jul 2019 21:55:25 -0700
Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by
 SHSMSX106.ccr.corp.intel.com ([169.254.10.240]) with mapi id 14.03.0439.000;
 Thu, 11 Jul 2019 12:55:23 +0800
From: "Sun, Zailiang" <zailiang.sun@intel.com>
To: "Kinney, Michael D" <michael.d.kinney@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
CC: "Qian, Yi" <yi.qian@intel.com>, Gary Lin <glin@suse.com>
Subject: Re: [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all build scripts
Thread-Topic: [edk2-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all
 build scripts
Thread-Index: AQHVN1J9rVu22ZCy9k+x2nVCRlTSXqbE2wfA
Date: Thu, 11 Jul 2019 04:55:22 +0000
Message-ID: <7CB7EF03E15B5D48981329A508747A9850C95EA3@SHSMSX104.ccr.corp.intel.com>
References: <20190710190516.6012-1-michael.d.kinney@intel.com>
 <20190710190516.6012-27-michael.d.kinney@intel.com>
In-Reply-To: <20190710190516.6012-27-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: Kinney, Michael D
> Sent: Thursday, July 11, 2019 3:05 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-platforms Patch 26/28] Vlv2TbltDevicePkg: Clean up all bui=
ld
> scripts
>=20
> * Remove cln.sh
> * Remove unused PlatformDefintions.h file
> * Remove unused defines from DSC files
> * Make Windows and Linux script more consistent
> * Remove unused options from Windows/Linux scripts
> * Remove unused defines from Windows/Linux scripts
> * Do not modify Target.txt in Conf directory.  Instead,
>   pass all build flags on the command line
> * Generate build report in the build output directory
> * Generate build logs in the build output directory
> * Do not delete files from Conf directory
> * Update clean operation to only clean one platform target
> * Do not generate AutoPlatformCFG.txt file anymore
>=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>
> ---
>  Platform/Intel/Vlv2TbltDevicePkg/.gitignore   |   5 -
>  .../Intel/Vlv2TbltDevicePkg/Build_IFWI.bat    |  75 ++-------
>  .../Intel/Vlv2TbltDevicePkg/Build_IFWI.sh     |  57 +++----
>  .../Include/PlatformDefinitions.h             |  43 -----
>  .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc   |   2 -
>  .../Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc  |  55 +-----
>  .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc   |  53 +-----
>  .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc     |  53 +-----
>  .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc      |  55 +-----
>  Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat  | 120 ++++++-------
>  Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh   | 159 ++++++++----------
>  Platform/Intel/Vlv2TbltDevicePkg/cln.sh       |  62 -------
>  12 files changed, 156 insertions(+), 583 deletions(-)  delete mode 10064=
4
> Platform/Intel/Vlv2TbltDevicePkg/.gitignore
>  delete mode 100644
> Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
>  delete mode 100644 Platform/Intel/Vlv2TbltDevicePkg/cln.sh
>=20
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> b/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> deleted file mode 100644
> index c7698262ad..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/.gitignore
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -AutoPlatformCFG.txt
> -Stitch/Stitching.log
> -Stitch/MNW*.bin
> -Stitch/MNW*.rom
> -Stitch/MNW*.rom.orig
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> index 44759c617f..f65aa61f4a 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.bat
> @@ -9,15 +9,9 @@
>=20
>  SetLocal EnableDelayedExpansion EnableExtensions
>=20
> -@REM Go to work space directory.
> -cd ..
> -cd ..
> -
>  :: Assign initial values
>  set exitCode=3D0
>  set "Build_Flags=3D "
> -set "Stitch_Flags=3D "
> -set Arch=3DX64
>  set PLATFORM_PACKAGE=3DVlv2TbltDevicePkg
>=20
>  set PLATFORM_PATH=3D%WORKSPACE%
> @@ -42,11 +36,6 @@ if not
> exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% (  :OptLoop  if /i
> "%~1"=3D=3D"/?" goto Usage
>=20
> -if /i "%~1"=3D=3D"/q" (
> -    set Build_Flags=3D%Build_Flags% /q
> -    shift
> -    goto OptLoop
> -)
>  if /i "%~1"=3D=3D"/l" (
>      set Build_Flags=3D%Build_Flags% /l
>      shift
> @@ -67,53 +56,17 @@ if /i "%~1" =3D=3D "/c" (
>      shift
>      goto OptLoop
>  )
> -if /i "%~1" =3D=3D "/ECP" (
> -    set Build_Flags=3D%Build_Flags% /ecp
> -    shift
> -    goto OptLoop
> -)
> -
> -if /i "%~1"=3D=3D"/s" (
> -    set Build_Flags=3D%Build_Flags% /s
> -    shift
> -    goto OptLoop
> -)
> -
>  if /i "%~1"=3D=3D"/x64" (
> -    set Arch=3DX64
>      set Build_Flags=3D%Build_Flags% /x64
>      shift
>      goto OptLoop
>  )
> -
>  if /i "%~1"=3D=3D"/IA32" (
> -    set Arch=3DIA32
>      set Build_Flags=3D%Build_Flags% /IA32
>      shift
>      goto OptLoop
>  )
>=20
> -if /i "%~1"=3D=3D"/nG" (
> -    set Stitch_Flags=3D%Stitch_Flags% /nG
> -    shift
> -    goto OptLoop
> -)
> -if /i "%~1"=3D=3D"/nM" (
> -    set Stitch_Flags=3D%Stitch_Flags% /nM
> -    shift
> -    goto OptLoop
> -)
> -if /i "%~1"=3D=3D"/nB" (
> -    set Stitch_Flags=3D%Stitch_Flags% /nB
> -    shift
> -    goto OptLoop
> -)
> -if /i "%~1"=3D=3D"/yL" (
> -    set Stitch_Flags=3D%Stitch_Flags% /yL
> -    shift
> -    goto OptLoop
> -)
> -
>  :: Require 2 input parameters
>  if "%~2"=3D=3D"" goto Usage
>=20
> @@ -125,7 +78,7 @@ set Build_Target=3D%~2
>  echo
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>  echo Build_IFWI:  Calling BIOS build Script...
>=20
> -
> call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Flag
> s%  %Platform_Type% %Build_Target%
> +call %PLATFORM_PATH%\%PLATFORM_PACKAGE%\bld_vlv.bat %Build_Fla
> gs%
> +%Platform_Type% %Build_Target%
>=20
>  if %ERRORLEVEL% NEQ 0 (
>      echo echo  -- Error Building BIOS  & echo.
> @@ -139,23 +92,21 @@ goto Exit
>  :Usage
>  echo Script to build BIOS firmware and stitch the entire IFWI.
>  echo.
> -echo Usage: Build_IFWI.bat [options]  PlatformType  BuildTarget  [IFWI
> Suffix]
> +echo Usage: Build_IFWI.bat [options]  PlatformType  BuildTarget
>  echo.
> -echo        /c     CleanAll before building
> -echo        /x64   Set Arch to X64  (default: X64)
> -echo        /IA32  Set Arch to IA32 (default: X64)
> -echo        /yL    Enable SPI lock
> -echo.
> -echo        Platform Types:   MNW2
> -echo        Build Targets:    Release, Debug
> -echo        IFWI Suffix:      Suffix to append to end of IFWI filename (=
default:
> MM_DD_YYYY)
> +echo    /c    CleanAll
> +echo    /l    Generate build log file
> +echo    /y    Generate build report file
> +echo    /m    Enable multi-processor build
> +echo    /IA32 Set Arch to IA32 (default: X64)
> +echo    /X64  Set Arch to X64 (default: X64)
>  echo.
> -echo        See  Stitch/Stitch_Config.txt  for additional stitching sett=
ings.
> +echo        Platform Types:  MNW2
> +echo        Build Targets:   Debug, Release  (default: Debug)
>  echo.
> -echo        If capsule update is needed, please update CAPSULE_ENABLE =
=3D
> TRUE in Config.dsc.
> -echo        If recovery is needed, please update RECOVERY_ENABLE =3D TRU=
E in
> Config.dsc.
> -echo        If either of above is TRUE, please set OPENSSL_PATH in windo=
ws
> evironment
> -echo        and put openssl.exe there, to generate final capsule image.
> +echo Examples:
> +echo    Build_IFWI.bat MNW2 debug           : X64 Debug build for Minnow=
Max
> +echo    Build_IFWI.bat /IA32 MNW2 release   : IA32 Release build for
> MinnowMax
>  echo.
>  set exitCode=3D1
>=20
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> index 349f0c7ba7..153c8c5fae 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/Build_IFWI.sh
> @@ -6,15 +6,21 @@ function Usage ( ) {
>    echo
>    echo "Script to build BIOS firmware and stitch the entire IFWI."
>    echo
> -  echo "Usage: Build_IFWI.sh [options]  PlatformType  BuildTarget  "
> +  echo "Usage: Build_IFWI.sh [options]  PlatformType  BuildTarget"
>    echo
> -  echo
> -  echo "       /yL [option]  :   Enable SPI lock"
> -  echo "       Platform Types:   MNW2"
> -  echo "       Build Targets:    Release, Debug"
> +  echo "   /c    CleanAll"
> +  echo "   /l    Generate build log file"
> +  echo "   /y    Generate build report file"
> +  echo "   /m    Enable multi-processor build"
> +  echo "   /IA32 Set Arch to IA32 (default: X64)"
> +  echo "   /X64  Set Arch to X64 (default: X64)"
>    echo
> -  echo "       See  Stitch/Stitch_Config.txt  for additional stitching s=
ettings."
> +  echo "       Platform Types:  MNW2"
> +  echo "       Build Targets:   Debug, Release  (default: Debug)"
>    echo
> +  echo "Examples:"
> +  echo "   Build_IFWI.sh MNW2 debug           : X64 Debug build for
> MinnowMax"
> +  echo "   Build_IFWI.sh /IA32 MNW2 release   : IA32 Release build for
> MinnowMax"
>    echo
>    exit 0
>  }
> @@ -24,9 +30,6 @@ set -e
>  ## Assign initial values
>  exitCode=3D0
>  Build_Flags=3D
> -Stitch_Flags=3D
> -Arch=3DX64
> -PLATFORM_PACKAGE=3DVlv2TbltDevicePkg
>=20
>  ## Check whether WORKSPACE is set or not  if [[ -z "$WORKSPACE" ]]; then
> @@ -47,41 +50,24 @@ fi
>=20
>  for (( i=3D1; i<=3D$#; ))
>    do
> -    if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Q" ]; then
> -      Build_Flags=3D"$Build_Flags /q"
> -      shift
> -    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then
> +    if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then
>        Build_Flags=3D"$Build_Flags /l"
>        shift
> +    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Y" ]; then
> +      Build_Flags=3D"$Build_Flags /y"
> +      shift
> +    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/M" ]; then
> +      Build_Flags=3D"$Build_Flags /m"
> +      shift
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/C" ]; then
>        Build_Flags=3D"$Build_Flags /c"
>        shift
> -    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/ECP" ]; then
> -      Build_Flags=3D"$Build_Flags /ecp"
> -      shift
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/X64" ]; then
> -      Arch=3DX64
>        Build_Flags=3D"$Build_Flags /x64"
>        shift
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/IA32" ]; then
> -      Arch=3DIA32
>        Build_Flags=3D"$Build_Flags /IA32"
>        shift
> -    elif [ "$1" =3D=3D "/nG" ]; then
> -      Stitch_Flags=3D"$Stitch_Flags /nG"
> -      shift
> -    elif [ "$1" =3D=3D "/nM" ]; then
> -      Stitch_Flags=3D"$Stitch_Flags /nM"
> -      shift
> -    elif [ "$1" =3D=3D "/nB" ]; then
> -      Stitch_Flags=3D"$Stitch_Flags /nB"
> -      shift
> -    elif [ "$1" =3D=3D "/nV" ]; then
> -      Stitch_Flags=3D"$Stitch_Flags /nV"
> -      shift
> -    elif [ "$1" =3D=3D "/yL" ]; then
> -      Build_Flags=3D"$Build_Flags /yL"
> -      shift
>      else
>        break
>      fi
> @@ -95,11 +81,6 @@ fi
>  ## Assign required arguments
>  Platform_Type=3D$1
>  Build_Target=3D$2
> -if [ "$3" =3D=3D "" ]; then
> -  IFWI_Suffix=3D
> -else
> -  IFWI_Suffix=3D"/S $3"
> -fi
>=20
>  ## Build BIOS
>  echo
> "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D"
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions=
.h
> b/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> deleted file mode 100644
> index a64cda0799..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/Include/PlatformDefinitions.h
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -/*++
> -
> -Copyright (c) 1999  - 2014, Intel Corporation. All rights reserved
> -
>=20
> -  SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -
>=20
> -
> -
> -Module Name:
> -
> -  PlatformDefinitions.h
> -
> -Abstract:
> -
> -  This header file provides platform specific definitions used by other
> modules
> -  for platform specific initialization.
> -
> -  THIS FILE SHOULD ONLY CONTAIN #defines BECAUSE IT IS CONSUMED BY
> NON-C MODULES
> -  (ASL and VFR)
> -
> -  This file should not contain addition or other operations that an ASL
> compiler or
> -  VFR compiler does not understand.
> -
> ---*/
> -
> -#ifndef _PLATFORM_DEFINITIONS_H_
> -#define _PLATFORM_DEFINITIONS_H_
> -
> -
> -//
> -// Platform Base Address definitions
> -//
> -#define PCIEX_BASE_ADDRESS          EDKII_GLUE_PciExpressBaseAddress //
> Pci Express Configuration Space Base Address
> -
> -#define PCIEX_LENGTH                PLATFORM_PCIEXPRESS_LENGTH
> -
> -#define THERMAL_BASE_ADDRESS        0xFED08000
> -
> -#ifndef MCH_BASE_ADDRESS
> -#define MCH_BASE_ADDRESS            0xFED10000  // MCH  Register Base
> Address
> -#endif
> -#endif
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> index 7b48d7b44e..43db3e28ab 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
> @@ -54,8 +54,6 @@
>  DEFINE USB_SERIAL_STATUS_CODE_ENABLE =3D FALSE  DEFINE
> RAM_SERIAL_STATUS_CODE_ENABLE =3D FALSE
>=20
> -DEFINE ENBDT_S3_SUPPORT =3D TRUE
> -
>  DEFINE LZMA_ENABLE =3D TRUE
>  DEFINE S4_ENABLE =3D TRUE
>=20
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> index eb7ae46505..0f9651cfba 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccIA32.dsc
> @@ -27,20 +27,9 @@ [Defines]
>    #
>    # Platform On/Off features are defined here
>    #
> -  #
> -  # Platform Support:: Set only one token except Crestview Hills
> -  #
> -  #   3.BayleyBay
> -  #     ENBDT_PF_ENABLE  =3D TRUE
> -  #
> -  !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
>    !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
> -  DEFINE      DXE_ARCHITECTURE        =3D X64
> -!else
>    DEFINE      DXE_ARCHITECTURE        =3D IA32
> -!endif
>=20
>    FLASH_DEFINITION                    =3D Vlv2TbltDevicePkg/PlatformPkgG=
cc.fdf
>  !if $(LFMA_ENABLE) =3D=3D TRUE
> @@ -761,8 +750,6 @@ [Components.IA32]
>=20
>  !if $(RC_BINARY_RELEASE) =3D=3D TRUE
>    Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> -    <BuildOptions>
> -      *_*_IA32_CC_FLAGS      =3D -DRC_BINARY_RELEASE
>    !if $(TARGET) =3D=3D DEBUG
>        <PcdsFixedAtBuild>
>          gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1231,56 +1218,19 @@ [BuildOptions]
>  #
>  # Define token for different Platform
>  #
> -  DEFINE MINNOW2_FSP_OPTION =3D
> -
> -!if $(ENBDT_PF_BUILD) =3D=3D TRUE
> -  DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 -!else
> -  DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D0 -!endif
> -
> -
>  !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE
>    DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D -
> DCLKGEN_CONFIG_EXTRA=3D1  !else
>    DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D  !endif
>=20
> -
> -
>  !if $(PCIESC_ENABLE) =3D=3D TRUE
>    DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D -DPCIESC_SUPPORT=3D1  !else
>    DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D
>  !endif
> -!if $(SATA_ENABLE) =3D=3D TRUE
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D -DSATA_SUPPORT=3D1 -!else
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D
> -!endif
> -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -DNOCS_S3_SUPPORT -!else
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D
> -!endif
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
> -  DEFINE X64_BUILD_ENABLE =3D -DX64_BUILD_ENABLE=3D1 -!else
> -  DEFINE X64_BUILD_ENABLE =3D
> -!endif
> -
> -!if $(TPM_ENABLED) =3D=3D TRUE
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D -DTPM_ENABLED -!else
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D
> -!endif
> -
> -
> -  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE
> -  DEFINE PDB_BUILD_OPTION =3D /Zi
> -!endif
> +  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>=20
>    GCC:*_*_*_CC_FLAGS =3D -Wno-missing-braces  !if
> $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -1290,7 +1240,6 @@ [BuildOptions]
>    DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D  !else
>    DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D
> -
>  !endif
>=20
>  #
> @@ -1310,8 +1259,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
>    GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000
>=20
>  [BuildOptions.Common.EDKII]
> -  *_*_IA32_ASM_FLAGS     =3D $(VP_BUILD_OPTIONS) -D
> EDKII_GLUE_PciExpressBaseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h -
> DNOCS_S3_SUPPORT
> -
>    *_*_IA32_CC_FLAGS      =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_VFRPP_FLAGS   =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_APP_FLAGS     =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> index 69f2b22aff..257bba7485 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
> @@ -27,22 +27,11 @@ [Defines]
>    #
>    # Platform On/Off features are defined here
>    #
> -  #
> -  # Platform Support:: Set only one token except Crestview Hills
> -  #
> -  #   3.BayleyBay
> -  #     ENBDT_PF_ENABLE  =3D TRUE
> -  #
> -  !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
>    !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>=20
>    DEFINE PLATFORMX64_ENABLE =3D TRUE
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
>    DEFINE      DXE_ARCHITECTURE        =3D X64
> -!else
> -  DEFINE      DXE_ARCHITECTURE        =3D IA32
> -!endif
>=20
>    FLASH_DEFINITION                    =3D Vlv2TbltDevicePkg/PlatformPkgG=
cc.fdf
>  !if $(LFMA_ENABLE) =3D=3D TRUE
> @@ -763,8 +752,6 @@ [Components.IA32]
>=20
>  !if $(RC_BINARY_RELEASE) =3D=3D TRUE
>    Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> -    <BuildOptions>
> -      *_*_IA32_CC_FLAGS      =3D -DRC_BINARY_RELEASE
>    !if $(TARGET) =3D=3D DEBUG
>        <PcdsFixedAtBuild>
>          gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1246,15 +1233,6 @@ [BuildOptions]
>  #
>  # Define token for different Platform
>  #
> -  DEFINE MINNOW2_FSP_OPTION =3D
> -
> -!if $(ENBDT_PF_BUILD) =3D=3D TRUE
> -  DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D1 -!else
> -  DEFINE ENBDT_PF_ENABLE =3D -DENBDT_PF_ENABLE=3D0 -!endif
> -
> -
>  !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE
>    DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D -
> DCLKGEN_CONFIG_EXTRA=3D1  !else @@ -1268,34 +1246,8 @@
> [BuildOptions]  !else
>    DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D
>  !endif
> -!if $(SATA_ENABLE) =3D=3D TRUE
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D -DSATA_SUPPORT=3D1 -!else
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D
> -!endif
> -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D -DNOCS_S3_SUPPORT -!else
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D
> -!endif
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
> -  DEFINE X64_BUILD_ENABLE =3D -DX64_BUILD_ENABLE=3D1 -!else
> -  DEFINE X64_BUILD_ENABLE =3D
> -!endif
> -
> -!if $(TPM_ENABLED) =3D=3D TRUE
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D -DTPM_ENABLED -!else
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D
> -!endif
> -
> -
> -  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE
> -  DEFINE PDB_BUILD_OPTION =3D /Zi
> -!endif
> +  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>=20
>    GCC:*_*_*_CC_FLAGS =3D -Wno-missing-braces  !if
> $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE @@ -1305,7 +1257,6 @@ [BuildOptions]
>    DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D  !else
>    DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D
> -
>  !endif
>=20
>  #
> @@ -1325,8 +1276,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
>    GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000
>=20
>  [BuildOptions.Common.EDKII]
> -  *_*_IA32_ASM_FLAGS     =3D $(VP_BUILD_OPTIONS) -D
> EDKII_GLUE_PciExpressBaseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h -
> DNOCS_S3_SUPPORT
> -
>    *_*_IA32_CC_FLAGS      =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_VFRPP_FLAGS   =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_APP_FLAGS     =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> index 7092ab6e6b..23e296d432 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
> @@ -27,20 +27,9 @@ [Defines]
>    #
>    # Platform On/Off features are defined here
>    #
> -  #
> -  # Platform Support:: Set only one token except Crestview Hills
> -  #
> -  #   3.BayleyBay
> -  #     ENBDT_PF_ENABLE  =3D TRUE
> -  #
> -  !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
>    !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
> -  DEFINE      DXE_ARCHITECTURE        =3D X64
> -!else
>    DEFINE      DXE_ARCHITECTURE        =3D IA32
> -!endif
>=20
>    FLASH_DEFINITION                    =3D Vlv2TbltDevicePkg/PlatformPkg.=
fdf
>  !if $(LFMA_ENABLE) =3D=3D TRUE
> @@ -761,8 +750,6 @@ [Components.IA32]
>=20
>  !if $(RC_BINARY_RELEASE) =3D=3D TRUE
>    Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> -    <BuildOptions>
> -      *_*_IA32_CC_FLAGS      =3D /DRC_BINARY_RELEASE
>    !if $(TARGET) =3D=3D DEBUG
>        <PcdsFixedAtBuild>
>          gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1231,15 +1218,6 @@ [BuildOptions]
>  #
>  # Define token for different Platform
>  #
> -  DEFINE MINNOW2_FSP_OPTION =3D
> -
> -!if $(ENBDT_PF_BUILD) =3D=3D TRUE
> -  DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 -!else
> -  DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 -!endif
> -
> -
>  !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE
>    DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D
> /DCLKGEN_CONFIG_EXTRA=3D1  !else @@ -1253,34 +1231,8 @@
> [BuildOptions]  !else
>    DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D
>  !endif
> -!if $(SATA_ENABLE) =3D=3D TRUE
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D /DSATA_SUPPORT=3D1 -!else
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D
> -!endif
> -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT -!else
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D
> -!endif
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
> -  DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 -!else
> -  DEFINE X64_BUILD_ENABLE =3D
> -!endif
> -
> -!if $(TPM_ENABLED) =3D=3D TRUE
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED -!else
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D
> -!endif
> -
> -
> -  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE
> -  DEFINE PDB_BUILD_OPTION =3D /Zi
> -!endif
> +  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>=20
>  !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE
>    MSFT:*_*_X64_GENFW_FLAGS  =3D --keepexceptiontable @@ -1291,7
> +1243,6 @@ [BuildOptions]  !endif  !else
>    DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D
> -
>  !endif
>=20
>  #
> @@ -1311,8 +1262,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
>    GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000
>=20
>  [BuildOptions.Common.EDKII]
> -  *_*_IA32_ASM_FLAGS     =3D $(VP_BUILD_OPTIONS) /D
> EDKII_GLUE_PciExpressBaseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h
> /DNOCS_S3_SUPPORT
> -
>    *_*_IA32_CC_FLAGS      =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_VFRPP_FLAGS   =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_APP_FLAGS     =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> index 238561191f..e0fd767dea 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
> @@ -27,22 +27,11 @@ [Defines]
>    #
>    # Platform On/Off features are defined here
>    #
> -  #
> -  # Platform Support:: Set only one token except Crestview Hills
> -  #
> -  #   3.BayleyBay
> -  #     ENBDT_PF_ENABLE  =3D TRUE
> -  #
> -  !include Vlv2TbltDevicePkg/AutoPlatformCFG.txt
>    !include Vlv2TbltDevicePkg/PlatformPkgConfig.dsc
>=20
>    DEFINE PLATFORMX64_ENABLE =3D TRUE
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
>    DEFINE      DXE_ARCHITECTURE        =3D X64
> -!else
> -  DEFINE      DXE_ARCHITECTURE        =3D IA32
> -!endif
>=20
>    FLASH_DEFINITION                    =3D Vlv2TbltDevicePkg/PlatformPkg.=
fdf
>  !if $(LFMA_ENABLE) =3D=3D TRUE
> @@ -763,8 +752,6 @@ [Components.IA32]
>=20
>  !if $(RC_BINARY_RELEASE) =3D=3D TRUE
>    Vlv2TbltDevicePkg/PlatformPei/PlatformPei.inf {
> -    <BuildOptions>
> -      *_*_IA32_CC_FLAGS      =3D /DRC_BINARY_RELEASE
>    !if $(TARGET) =3D=3D DEBUG
>        <PcdsFixedAtBuild>
>          gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2E
> @@ -1246,56 +1233,19 @@ [BuildOptions]
>  #
>  # Define token for different Platform
>  #
> -  DEFINE MINNOW2_FSP_OPTION =3D
> -
> -!if $(ENBDT_PF_BUILD) =3D=3D TRUE
> -  DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D1 -!else
> -  DEFINE ENBDT_PF_ENABLE =3D /DENBDT_PF_ENABLE=3D0 -!endif
> -
> -
>  !if $(CLKGEN_CONFIG_EXTRA_ENABLE) =3D=3D TRUE
>    DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D
> /DCLKGEN_CONFIG_EXTRA=3D1  !else
>    DEFINE CLKGEN_CONFIG_EXTRA_BUILD_OPTION =3D  !endif
>=20
> -
> -
>  !if $(PCIESC_ENABLE) =3D=3D TRUE
>    DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D /DPCIESC_SUPPORT=3D1  !else
>    DEFINE PCIESC_SUPPORT_BUILD_OPTION =3D
>  !endif
> -!if $(SATA_ENABLE) =3D=3D TRUE
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D /DSATA_SUPPORT=3D1 -!else
> -  DEFINE SATA_SUPPORT_BUILD_OPTION =3D
> -!endif
> -!if $(ENBDT_S3_SUPPORT) =3D=3D TRUE
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D /DNOCS_S3_SUPPORT -!else
> -  DEFINE ENBDT_S3_SUPPORT_OPTIONS =3D
> -!endif
>=20
> -!if $(X64_CONFIG) =3D=3D TRUE
> -  DEFINE X64_BUILD_ENABLE =3D /DX64_BUILD_ENABLE=3D1 -!else
> -  DEFINE X64_BUILD_ENABLE =3D
> -!endif
> -
> -!if $(TPM_ENABLED) =3D=3D TRUE
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D /DTPM_ENABLED -!else
> -  DEFINE DSC_TPM_BUILD_OPTIONS =3D
> -!endif
> -
> -
> -  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION)
> $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION)
> $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION)
> $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS)
> $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS)
> $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS)
> $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS)
> $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION)
> $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS)
> $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
> -!if $(PERFORMANCE_ENABLE) =3D=3D TRUE
> -  DEFINE PDB_BUILD_OPTION =3D /Zi
> -!endif
> +  DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS =3D
> + $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION)
> $(PCIESC_SUPPORT_BUILD_OPTION)
>=20
>  !if $(SOURCE_DEBUG_ENABLE) =3D=3D TRUE
>    MSFT:*_*_X64_GENFW_FLAGS  =3D --keepexceptiontable @@ -1306,7
> +1256,6 @@ [BuildOptions]  !endif  !else
>    DEFINE SOURCE_LEVEL_DEBUG_BUILD_OPTIONS =3D
> -
>  !endif
>=20
>  #
> @@ -1326,8 +1275,6 @@ [BuildOptions.common.EDKII.DXE_SMM_DRIVER,
> BuildOptions.common.EDKII.SMM_CORE]
>    GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000
>=20
>  [BuildOptions.Common.EDKII]
> -  *_*_IA32_ASM_FLAGS     =3D $(VP_BUILD_OPTIONS) /D
> EDKII_GLUE_PciExpressBaseAddress=3D$(PLATFORM_PCIEXPRESS_BASE)h
> /DNOCS_S3_SUPPORT
> -
>    *_*_IA32_CC_FLAGS      =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_VFRPP_FLAGS   =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
>    *_*_IA32_APP_FLAGS     =3D $(EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS)
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> index ffd6722582..c39b8ccd62 100644
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.bat
> @@ -11,7 +11,6 @@ echo.
>  echo %date%  %time%
>  echo.
>=20
> -
>  ::*********************************************************
> *************
>  :: Initial Setup
>  ::*********************************************************
> *************
> @@ -20,9 +19,14 @@ set /a build_threads=3D1  set "Build_Flags=3D "
>  set exitCode=3D0
>  set Arch=3DX64
> -set Source=3D0
> +set GenLog=3DFALSE
> +set GenReport=3DFALSE
> +set Clean=3DFALSE
>  set PLATFORM_NAME=3DVlv2TbltDevicePkg
>=20
> +::********************************************************
> *************
> +*
> +:: Detect full path to the edk2 repo
> +::********************************************************
> *************
> +*
>  set CORE_PATH=3D%WORKSPACE%
>  if not exist %CORE_PATH%\edksetup.bat (
>    if defined PACKAGES_PATH (
> @@ -41,6 +45,9 @@ if not exist %CORE_PATH%\edksetup.bat (
>  )
>  :CorePathFound
>=20
> +::********************************************************
> *************
> +*
> +:: Detect full path to the Vlv2TbltDevicePkg
> +::********************************************************
> *************
> +*
>  set PLATFORM_PACKAGE=3D%WORKSPACE%\%PLATFORM_NAME%
>  if not exist %PLATFORM_PACKAGE% (
>    if defined PACKAGES_PATH (
> @@ -61,28 +68,13 @@ if not exist %PLATFORM_PACKAGE% (
>=20
>  cd %CORE_PATH%
>=20
> -:: Clean up previous build files.
> -if exist %WORKSPACE%\edk2.log del %WORKSPACE%\edk2.log -if
> exist %WORKSPACE%\unitool.log del %WORKSPACE%\unitool.log -if
> exist %WORKSPACE%\Conf\target.txt del %WORKSPACE%\Conf\target.txt -
> if exist %WORKSPACE%\Conf\tools_def.txt
> del %WORKSPACE%\Conf\tools_def.txt -if
> exist %WORKSPACE%\Conf\build_rule.txt
> del %WORKSPACE%\Conf\build_rule.txt -if
> exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache
> +::********************************************************
> *************
> +*
> +:: Run edksetup.bat and make sure tools are up to date
> +::********************************************************
> *************
> +*
>=20
> -:: Setup EDK environment. Edksetup puts new copies of target.txt,
> tools_def.txt, build_rule.txt in WorkSpace\Conf
> -:: Also run edksetup as soon as possible to avoid it from changing
> environment variables we're overriding  call %CORE_PATH%\edksetup.bat
> Rebuild  @echo off
>=20
> -:: Define platform specific environment variables.
> -set config_file=3D%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc
> -set auto_config_inc=3D%PLATFORM_PACKAGE%\AutoPlatformCFG.txt
> -
> -
> -
> -::create new AutoPlatformCFG.txt file
> -copy /y nul %auto_config_inc% >nul
> -
>  ::*********************************************************
> *************
>  :: Parse command line arguments
>  ::*********************************************************
> *************
> @@ -92,12 +84,12 @@ copy /y nul %auto_config_inc% >nul  if /i "%~1"=3D=3D=
"/?"
> goto Usage
>=20
>  if /i "%~1"=3D=3D"/l" (
> -    set Build_Flags=3D%Build_Flags% -j EDK2.log
> +    set GenLog=3DTRUE
>      shift
>      goto OptLoop
>  )
>  if /i "%~1"=3D=3D"/y" (
> -    set Build_Flags=3D%Build_Flags% -
> y %PLATFORM_PACKAGE%\EDK2_%PLATFORM_PACKAGE%.report
> +    set GenReport=3DTRUE
>      shift
>      goto OptLoop
>  )
> @@ -109,16 +101,7 @@ if /i "%~1"=3D=3D"/m" (
>      goto OptLoop
>  )
>  if /i "%~1" =3D=3D "/c" (
> -    echo Removing previous build files ...
> -    if exist build (
> -        del /f/s/q build > nul
> -        rmdir /s/q build
> -    )
> -    if exist %WORKSPACE%\Conf\.cache (
> -        del /f/s/q %WORKSPACE%\Conf\.cache > nul
> -        rmdir /s/q %WORKSPACE%\Conf\.cache
> -    )
> -    echo.
> +    set Clean=3DTRUE
>      shift
>      goto OptLoop
>  )
> @@ -137,23 +120,6 @@ if /i "%~1"=3D=3D"/IA32" (
>  :: Required argument(s)
>  if "%~1"=3D=3D"" goto Usage
>=20
> -if "%Arch%"=3D=3D"IA32" (
> -    echo DEFINE X64_CONFIG =3D FALSE  >> %auto_config_inc%
> -) else if "%Arch%"=3D=3D"X64" (
> -    echo DEFINE X64_CONFIG =3D TRUE  >> %auto_config_inc%
> -)
> -
> -:: -- Build flags settings for each Platform -- -echo Setting  %1  platf=
orm
> configuration...
> -if /i "%~1" =3D=3D "MNW2" (
> -    echo DEFINE ENBDT_PF_BUILD =3D TRUE   >> %auto_config_inc%
> -
> -) else (
> -    echo Error - Unsupported PlatformType: %1
> -    goto Usage
> -)
> -set Platform_Type=3D%~1
> -
>  if /i "%~2" =3D=3D "RELEASE" (
>      set target=3DRELEASE
>  ) else (
> @@ -161,8 +127,9 @@ if /i "%~2" =3D=3D "RELEASE" (
>  )
>=20
>  ::*********************************************************
> *************
> -:: Additional EDK Build Setup/Configuration
> +:: Detect TOOL_CHAIN_TAG
>  ::*********************************************************
> *************
> +
>  echo.
>  echo Setting the Build environment for
> VS2015/VS2013/VS2012/VS2010/VS2008...
>  if defined VS140COMNTOOLS (
> @@ -206,6 +173,10 @@ if defined VS140COMNTOOLS (
>    goto :BldFail
>  )
>=20
> +::********************************************************
> *************
> +*
> +:: Generate BUILD_PATH and make sure the directory exists
> +::********************************************************
> *************
> +*
> +
>  echo Ensuring correct build directory is present  if not
> exist %WORKSPACE%\Build mkdir %WORKSPACE%\Build  if
> "%Arch%"=3D=3D"IA32" ( @@ -217,26 +188,41 @@ if "%Arch%"=3D=3D"IA32" (
>  )
>  if not exist %BUILD_PATH% mkdir %BUILD_PATH%
>=20
> -echo Modifing Conf files for this build...
> -:: Remove lines with these tags from target.txt -findstr /V "TARGET
> TARGET_ARCH  TOOL_CHAIN_TAG  BUILD_RULE_CONF  ACTIVE_PLATFORM
> MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt >
> %WORKSPACE%\Conf\target.txt.tmp
> +::********************************************************
> *************
> +*
> +:: Check for clean operation
> +::********************************************************
> *************
> +*
>=20
> -echo TARGET
> =3D %TARGET%                                  >> %WORKSPACE%\Conf\target.=
txt.tmp
> +if "%Clean%"=3D=3D"TRUE" (
> +  echo Removing previous build files ...
> +  if exist %BUILD_PATH% (
> +    rmdir /s/q %BUILD_PATH%
> +  )
> +  if exist %WORKSPACE%\Conf\.cache (
> +    rmdir /s/q %WORKSPACE%\Conf\.cache
> +  )
> +  echo.
> +  goto :Exit
> +)
> +
> +::********************************************************
> *************
> +*
> +:: Generate Build_Flags
> +::********************************************************
> *************
> +*
> +
> +set Build_Flags=3D%Build_Flags% -b %TARGET%
>  if "%Arch%"=3D=3D"IA32" (
> -    echo TARGET_ARCH =3D
> IA32                                       >> %WORKSPACE%\Conf\target.txt=
.tmp
> +    set Build_Flags=3D%Build_Flags% -a IA32
>  ) else if "%Arch%"=3D=3D"X64" (
> -    echo TARGET_ARCH =3D IA32
> X64                                  >> %WORKSPACE%\Conf\target.txt.tmp
> +    set Build_Flags=3D%Build_Flags% -a IA32 -a X64
>  )
> -echo TOOL_CHAIN_TAG
> =3D %TOOL_CHAIN_TAG%                                  >> %WORKSPACE%\Conf=
\target.txt
> .tmp
> -echo BUILD_RULE_CONF =3D
> Conf/build_rule.txt                               >> %WORKSPACE%\Conf\tar=
get.txt.tmp
> -if %Source% =3D=3D 0 (
> -  echo ACTIVE_PLATFORM
> =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc        >> %WORKSPACE%
> \Conf\target.txt.tmp
> -) else (
> -  echo ACTIVE_PLATFORM
> =3D %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc  >> %WORKSPA
> CE%\Conf\target.txt.tmp
> +set Build_Flags=3D%Build_Flags% -t %TOOL_CHAIN_TAG% set
> +Build_Flags=3D%Build_Flags% -
> p %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc
> +set Build_Flags=3D%Build_Flags% -n %build_threads% if
> "%GenLog%"=3D=3D"TRUE"
> +(
> +  set Build_Flags=3D%Build_Flags% -
> j %BUILD_PATH%\%PLATFORM_NAME%.log
> +)
> +if "%GenReport%"=3D=3D"TRUE" (
> +  set Build_Flags=3D%Build_Flags% -
> y %BUILD_PATH%\%PLATFORM_NAME%.report
>  )
> -echo MAX_CONCURRENT_THREAD_NUMBER
> =3D %build_threads%                      >> %WORKSPACE%\Conf\target.txt.t=
mp
> -
> -move
> /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >n
> ul
>=20
>  ::*********************************************************
> *************
>  :: Generate BIOS ID
> @@ -267,6 +253,8 @@ echo VERSION_MINOR  =3D
> 01      >> %BUILD_PATH%/BiosId.env
>=20
>  echo.
>  echo Invoking EDK2 build...
> +echo build %Build_Flags%
> +
>  call build %Build_Flags%
>=20
>  if %ERRORLEVEL% NEQ 0 goto BldFail
> @@ -300,7 +288,7 @@ echo Build BIOS rom for VLV platforms.
>  echo.
>  echo Usage: bld_vlv.bat [options] PlatformType [Build Target]  echo.
> -echo    /c    CleanAll before building
> +echo    /c    CleanAll
>  echo    /l    Generate build log file
>  echo    /y    Generate build report file
>  echo    /m    Enable multi-processor build
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> index 1705b1628b..d32beb6a45 100755
> --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh
> @@ -7,15 +7,22 @@ function Usage() {
>    echo
> "**********************************************************
> *****************"
>    echo "Build BIOS rom for VLV platforms."
>    echo
> -  echo "Usage: bld_vlv.sh  PlatformType [Build Target]"
> +  echo "Usage: bld_vlv.sh  [options] PlatformType [Build Target]"
>    echo
> +  echo "   /c    CleanAll"
> +  echo "   /l    Generate build log file"
> +  echo "   /y    Generate build report file"
> +  echo "   /m    Enable multi-processor build"
> +  echo "   /IA32 Set Arch to IA32 (default: X64)"
> +  echo "   /X64  Set Arch to X64 (default: X64)"
>    echo
>    echo "       Platform Types:  MNW2"
>    echo "       Build Targets:   Debug, Release  (default: Debug)"
>    echo
> +  echo "Examples:"
> +  echo "   bld_vlv.sh MNW2                 : X64 Debug build for MinnowM=
ax"
> +  echo "   bld_vlv.sh /IA32 MNW2 release   : IA32 Release build for
> MinnowMax"
>    echo
> "**********************************************************
> *****************"
> -  echo "Press any key......"
> -  read
>    exit 0
>  }
>=20
> @@ -29,8 +36,12 @@ echo -e $(date)
>  #build_threads=3D($NUMBER_OF_PROCESSORS)+1
>  Build_Flags=3D
>  exitCode=3D0
> +build_threads=3D1
>  Arch=3DX64
> -SpiLock=3D0
> +GenLog=3DFALSE
> +GenReport=3DFALSE
> +Clean=3DFALSE
> +
>=20
>  export CORE_PATH=3D$WORKSPACE/edk2
>  export PLATFORM_PATH=3D$WORKSPACE/edk2-platforms/Platform/Intel/
> @@ -38,27 +49,6 @@ export SILICON_PATH=3D$WORKSPACE/edk2-
> platforms/Silicon/Intel/
>  export BINARY_PATH=3D$WORKSPACE/edk2-non-osi/Silicon/Intel/
>  export
> PACKAGES_PATH=3D$PLATFORM_PATH:$SILICON_PATH:$BINARY_PATH:$COR
> E_PATH
>=20
> -## Clean up previous build files.
> -if [ -e $WORKSPACE/EDK2.log ]; then
> -  rm $WORKSPACE/EDK2.log
> -fi
> -
> -if [ -e $WORKSPACE/Unitool.log ]; then
> -  rm $WORKSPACE/Unitool.log
> -fi
> -
> -if [ -e $WORKSPACE/Conf/target.txt ]; then
> -  rm $WORKSPACE/Conf/target.txt
> -fi
> -
> -if [ -e $WORKSPACE/Conf/tools_def.txt ]; then
> -  rm $WORKSPACE/Conf/tools_def.txt
> -fi
> -
> -if [ -e $WORKSPACE/Conf/build_rule.txt ]; then
> -  rm $WORKSPACE/Conf/build_rule.txt
> -fi
> -
>  ## Setup EDK environment. Edksetup puts new copies of target.txt,
> tools_def.txt, build_rule.txt in WorkSpace\Conf  ## Also run edksetup as
> soon as possible to avoid it from changing environment variables we're
> overriding  cd $CORE_PATH @@ -69,17 +59,9 @@ make -C BaseTools
> PLATFORM_NAME=3DVlv2TbltDevicePkg
> PLATFORM_PACKAGE=3DVlv2TbltDevicePkg
>  PLATFORM_PKG_PATH=3D$PLATFORM_PATH/$PLATFORM_PACKAGE
> -config_file=3D$PLATFORM_PKG_PATH/PlatformPkgConfig.dsc
> -auto_config_inc=3D$PLATFORM_PKG_PATH/AutoPlatformCFG.txt
>=20
>  cd $PLATFORM_PKG_PATH
>=20
> -## create new AutoPlatformCFG.txt file
> -if [ -f "$auto_config_inc" ]; then
> -  rm $auto_config_inc
> -fi
> -touch $auto_config_inc
> -
>=20
> ##********************************************************
> **************
>  ## Parse command line arguments
>=20
> ##********************************************************
> **************
> @@ -89,17 +71,17 @@ for (( i=3D1; i<=3D$#; ))
>    do
>      if [ "$1" =3D=3D "/?" ]; then
>        Usage
> -    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Q" ]; then
> -      Build_Flags=3D"$Build_Flags --quiet"
> -      shift
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/L" ]; then
> -      Build_Flags=3D"$Build_Flags -j EDK2.log"
> +      GenLog=3DTRUE
> +      shift
> +    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/Y" ]; then
> +      GenReport=3DTRUE
> +      shift
> +    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/M" ]; then
> +      build_threads=3D8
>        shift
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/C" ]; then
> -      echo Removing previous build files ...
> -      if [ -d "Build" ]; then
> -        rm -r Build
> -      fi
> +      Clean=3DTRUE
>        shift
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/X64" ]; then
>        Arch=3DX64
> @@ -107,9 +89,6 @@ for (( i=3D1; i<=3D$#; ))
>      elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/IA32" ]; then
>        Arch=3DIA32
>        shift
> -    elif [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "/YL" ]; then
> -      SpiLock=3D1
> -      shift
>      else
>        break
>      fi
> @@ -120,26 +99,7 @@ if [ "$2" =3D=3D "" ]; then
>    Usage
>  fi
>=20
> -if [ $Arch =3D=3D "IA32" ]; then
> -  echo DEFINE X64_CONFIG =3D FALSE >> $auto_config_inc -else
> -  echo DEFINE X64_CONFIG =3D TRUE  >> $auto_config_inc -fi
> -
> -## -- Build flags settings for each Platform --
> -##    AlpineValley (ALPV):  SVP_PF_BUILD =3D TRUE,   ENBDT_PF_BUILD =3D
> FALSE,  TABLET_PF_BUILD =3D FALSE,  BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD=
 =3D
> FALSE
> -##       BayleyBay (BBAY):  SVP_PF_BUILD =3D FALSE,  ENBDT_PF_BUILD =3D =
TRUE,
> TABLET_PF_BUILD =3D FALSE,  BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D FAL=
SE
> -##         BayLake (BLAK):  SVP_PF_BUILD =3D FALSE,  ENBDT_PF_BUILD =3D =
FALSE,
> TABLET_PF_BUILD =3D TRUE,   BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D FAL=
SE
> -##      Bakersport (BYTI):  SVP_PF_BUILD =3D FALSE,  ENBDT_PF_BUILD =3D =
FALSE,
> TABLET_PF_BUILD =3D FALSE,  BYTI_PF_BUILD =3D TRUE, IVI_PF_BUILD =3D FALS=
E
> -## Crestview Hills (CVHS):  SVP_PF_BUILD =3D FALSE,  ENBDT_PF_BUILD =3D
> FALSE,  TABLET_PF_BUILD =3D FALSE,  BYTI_PF_BUILD =3D TRUE, IVI_PF_BUILD =
=3D
> TRUE
> -##            FFD8 (BLAK):  SVP_PF_BUILD =3D FALSE,  ENBDT_PF_BUILD =3D =
FALSE,
> TABLET_PF_BUILD =3D TRUE,   BYTI_PF_BUILD =3D FALSE, IVI_PF_BUILD =3D FAL=
SE
>  echo "Setting  $1  platform configuration and BIOS ID..."
> -if [ "$(echo $1 | tr 'a-z' 'A-Z')" =3D=3D "MNW2" ]; then
> -  echo DEFINE ENBDT_PF_BUILD =3D TRUE >> $auto_config_inc -else
> -  echo "Error - Unsupported PlatformType: $1"
> -  Usage
> -fi
>=20
>  if [ "$(echo $2 | tr 'a-z' 'A-Z')" =3D=3D "RELEASE" ]; then
>    export TARGET=3DRELEASE
> @@ -148,18 +108,8 @@ else
>  fi
>=20
>=20
> ##********************************************************
> **************
> -## Additional EDK Build Setup/Configuration
> +## Detect TOOL_CHAIN_TAG
>=20
> ##********************************************************
> **************
> -echo "Ensuring correct build directory is present for GenBiosId..."
> -
> -echo Modifying Conf files for this build...
> -## Remove lines with these tags from target.txt -sed -i
> '/^ACTIVE_PLATFORM/d' $WORKSPACE/Conf/target.txt -sed -i '/^TARGET /d'
> $WORKSPACE/Conf/target.txt -sed -i '/^TARGET_ARCH/d'
> $WORKSPACE/Conf/target.txt -sed -i '/^TOOL_CHAIN_TAG/d'
> $WORKSPACE/Conf/target.txt -sed -i
> '/^MAX_CONCURRENT_THREAD_NUMBER/d' $WORKSPACE/Conf/target.txt
> -
>  gcc_version=3D$(gcc -v 2>&1 | tail -1 | awk '{print $3}')  case $gcc_ver=
sion in
>        [1-3].*|4.[0-7].*)
> @@ -167,31 +117,19 @@ case $gcc_version in
>          exit 1
>          ;;
>        4.8.*)
> -        TARGET_TOOLS=3DGCC48
> +        export TOOL_CHAIN_TAG=3DGCC48
>          ;;
>        4.9.*|6.[0-2].*)
> -        TARGET_TOOLS=3DGCC49
> +        export TOOL_CHAIN_TAG=3DGCC49
>          ;;
>        *)
> -        TARGET_TOOLS=3DGCC5
> +        export TOOL_CHAIN_TAG=3DGCC5
>          ;;
>  esac
>=20
> -ACTIVE_PLATFORM=3D$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc
> -export TOOL_CHAIN_TAG=3D$TARGET_TOOLS
> -MAX_CONCURRENT_THREAD_NUMBER=3D8
> -echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM                           >>
> $WORKSPACE/Conf/target.txt
> -echo TARGET          =3D $TARGET                                    >>
> $WORKSPACE/Conf/target.txt
> -echo TOOL_CHAIN_TAG  =3D $TOOL_CHAIN_TAG                            >>
> $WORKSPACE/Conf/target.txt
> -echo MAX_CONCURRENT_THREAD_NUMBER =3D
> $MAX_CONCURRENT_THREAD_NUMBER >> $WORKSPACE/Conf/target.txt -
> if [ $Arch =3D=3D "IA32" ]; then
> -  echo TARGET_ARCH   =3D IA32                                       >>
> $WORKSPACE/Conf/target.txt
> -else
> -  echo TARGET_ARCH   =3D IA32 X64                                   >>
> $WORKSPACE/Conf/target.txt
> -fi
> -
> -
> -## Set and Create $BUILD_PATH if necessary
> +##*******************************************************
> **************
> +* ## Generate $BUILD_PATH and make sure the directory exists
> +##*******************************************************
> **************
> +*
>  if [ ! -d ${WORKSPACE}/Build ]; then
>    mkdir ${WORKSPACE}/Build
>  fi
> @@ -212,6 +150,40 @@ if [ ! -d $BUILD_PATH ]; then
>    mkdir $BUILD_PATH
>  fi
>=20
> +##*******************************************************
> **************
> +*
> +## Check for clean operation
> +##*******************************************************
> **************
> +*
> +if [ $Clean =3D=3D "TRUE" ]; then
> +  echo Removing previous build files ...
> +  if [ -d ${BUILD_PATH} ]; then
> +    rm -r ${BUILD_PATH}
> +  fi
> +  if [ -d ${WORKSPACE}/Conf/.cache ]; then
> +    rm -r ${WORKSPACE}/Conf/.cache
> +  fi
> +  exit 0
> +fi
> +
> +##*******************************************************
> **************
> +*
> +## Generate Build_Flags
> +##*******************************************************
> **************
> +*
> +
> +Build_Flags=3D"$Build_Flags -b $TARGET"
> +if [ $Arch =3D=3D "IA32" ]; then
> +  Build_Flags=3D"$Build_Flags -a IA32"
> +else
> +  Build_Flags=3D"$Build_Flags -a IA32 -a X64"
> +fi
> +Build_Flags=3D"$Build_Flags -t $TOOL_CHAIN_TAG"
> +Build_Flags=3D"$Build_Flags -p
> ${PLATFORM_PKG_PATH}/PlatformPkgGcc${Arch}.dsc"
> +Build_Flags=3D"$Build_Flags -n $build_threads"
> +if [ $GenLog =3D=3D "TRUE" ]; then
> +  Build_Flags=3D"$Build_Flags -j ${BUILD_PATH}/${PLATFORM_NAME}.log"
> +fi
> +if [ $GenReport =3D=3D "TRUE" ]; then
> +  Build_Flags=3D"$Build_Flags -y
> ${BUILD_PATH}/${PLATFORM_NAME}.report"
> +fi
> +
>=20
> ##********************************************************
> **************
>  ## Generate BIOS ID
>=20
> ##********************************************************
> **************
> @@ -239,7 +211,8 @@ python $WORKSPACE/edk2-
> platforms/Platform/Intel/Tools/GenBiosId/GenBiosId.py -i  ## Build BIOS
>=20
> ##********************************************************
> **************
>  echo "Invoking EDK2 build..."
> -build
> +echo build $Build_Flags
> +build $Build_Flags
>=20
>=20
> ##********************************************************
> **************
>  ## Post Build processing and cleanup
> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> b/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> deleted file mode 100644
> index 3511695f6f..0000000000
> --- a/Platform/Intel/Vlv2TbltDevicePkg/cln.sh
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -#!/usr/bin/env bash
> -echo
> -echo Run build cleanall...
> -echo
> -
> -echo
> -echo Directories to clean...
> -echo
> -
> -cd ..
> -
> -if [ -d "Build" ]; then
> -  rm -r Build
> -fi
> -
> -if [ -d "Conf/.cache" ]; then
> -  rm -r Conf/.cache
> -fi
> -
> -if [ -d "RomImages" ]; then
> -  rm -r RomImages
> -fi
> -
> -echo
> -echo Files to clean...
> -echo
> -
> -if [ -e $(pwd)/EDK2.log ]; then
> -  rm $(pwd)/EDK2.log
> -fi
> -
> -if [ -e $(pwd)/Unitool.log ]; then
> -  rm $(pwd)/Unitool.log
> -fi
> -
> -if [ -e $(pwd)/Conf/target.txt ]; then
> -  rm $(pwd)/Conf/target.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/BiosId.env ]; then
> -  rm $(pwd)/Conf/BiosId.env
> -fi
> -
> -if [ -e $(pwd)/Conf/tools_def.txt ]; then
> -  rm $(pwd)/Conf/tools_def.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/build_rule.txt ]; then
> -  rm $(pwd)/Conf/build_rule.txt
> -fi
> -
> -if [ -e $(pwd)/Conf/BuildEnv.sh ]; then
> -  rm $(pwd)/Conf/BuildEnv.sh
> -fi
> -
> -if [ -e $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt ]; then
> -  rm $(pwd)/Vlv2TbltDevicePkg/AutoPlatformCFG.txt
> -fi
> -
> -echo
> -echo All done...
> -echo
> --
> 2.21.0.windows.1