From nobody Sun Feb 8 17:48:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+43503+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43503+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1562785522; cv=none; d=zoho.com; s=zohoarc; b=lxAJUc61PX2eouVaB75LHQGIQ0iL8WzfNlcPCJhv9otlFUI14XZ8qzHClIminw0FevF9OQF7qNRbWH+PTpkUPQlglzOVq8veSyNQIz6eIX6wCQBEGHVOBr/hX07/WW9PC3QQFFUuNWeT7DOt1s94mAr3qCcx/5RkMBfneQ01OHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562785522; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=GNwQ4GS8mDTTvASTxd2VCRbpPIrYDOt7x/NsH+Q2Eo0=; b=AeDCvXI5BX24vtwWUHR9zyscDkfvgMmli9VTcRr7tUh5s0nSOGKUlIoX4jhy9EMT5tdI6qZxxLffu1yXxNDdpdlo3Oh2TA+d7+UwOy7ImPkNhVBON5uSYoZdltXJWMVs+6SxJh7CzogNv3RuzUwH8JjtNqYV+QkwMzoOuqwPwek= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+43503+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1562785522497353.91270160167255; Wed, 10 Jul 2019 12:05:22 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:21 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jul 2019 12:05:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,475,1557212400"; d="scan'208";a="171008158" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.74]) by orsmga006.jf.intel.com with ESMTP; 10 Jul 2019 12:05:19 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Gary Lin , Zailiang Sun , Yi Qian Subject: [edk2-devel] [edk2-platforms Patch 06/28] Vlv2TbltDevicePkg/bld_vlv.sh: Update the script to fit edk2-platforms Date: Wed, 10 Jul 2019 12:04:54 -0700 Message-Id: <20190710190516.6012-7-michael.d.kinney@intel.com> In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1562785522; bh=yD5dr9siz8sspQadPEYYBj2JLx2FgikCEPAkJ3zZSuk=; h=Cc:Date:From:Reply-To:Subject:To; b=CCkpWbhtd4tkGSynkvtQL2jt28P/wntutqNx1BIxs4DBrMu4JZstsARtbawLYxKJvaC vIt41+jChjW8waHlIzEQimE/aad41Q/j4kNpR0iIcIqP9jtTvNx9r8Q73dm1D8YgUiMY/ w77FfDH8avEaHUmIhPU6bGm8SzJ+AW3S9wo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Gary Lin * Add "set -e" to exit immediately on error * Update the paths to fit the directory changes WORKSPACE +------edk2 (CORE) | +------edk2-platforms | | | +---Platform | | | | | +---Intel | | | | | +---Vlv2TbltDevicePkg (PLATFORM) | | | +---Silicon | | | +---Intel | | | +---Vlv2DeviceRefCodePkg (SILICON) | +------edk2-non-osi | +---Silicon | +---Intel | +---Vlv2SocBinPkg (BINARY) * Sync a part of bld_vlv.sh from the devel-MinnowBoardMax-UDK2017 branch to enable capsule building * Export TARGET and TOOL_CHAIN_TAG so that the GenerateCapsule scripts can use those variables Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin Reviewed-By: Zailiang Sun --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 57 ++++++++++++--------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/V= lv2TbltDevicePkg/bld_vlv.sh index 27772f47de..0aa1edfb22 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -7,7 +7,7 @@ function Usage() { echo "******************************************************************= *********" echo "Build BIOS rom for VLV platforms." echo - echo "Usage: bld_vlv.bat PlatformType [Build Target]" + echo "Usage: bld_vlv.sh PlatformType [Build Target]" echo echo echo " Platform Types: MNW2" @@ -19,44 +19,52 @@ function Usage() { exit 0 } =20 +set -e =20 +cd .. echo -e $(date) ##********************************************************************** ## Initial Setup ##********************************************************************** -#WORKSPACE=3D$(pwd) +export WORKSPACE=3D$(pwd) #build_threads=3D($NUMBER_OF_PROCESSORS)+1 Build_Flags=3D exitCode=3D0 Arch=3DX64 SpiLock=3D0 =20 +export CORE_PATH=3D$WORKSPACE/edk2 +export PLATFORM_PATH=3D$WORKSPACE/edk2-platforms/Platform/Intel/ +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:$CORE_PATH +cd ./edk2 + ## Clean up previous build files. -if [ -e $(pwd)/EDK2.log ]; then - rm $(pwd)/EDK2.log +if [ -e $CORE_PATH/EDK2.log ]; then + rm $CORE_PATH/EDK2.log fi =20 -if [ -e $(pwd)/Unitool.log ]; then - rm $(pwd)/Unitool.log +if [ -e $CORE_PATH/Unitool.log ]; then + rm $CORE_PATH/Unitool.log fi =20 -if [ -e $(pwd)/Conf/target.txt ]; then - rm $(pwd)/Conf/target.txt +if [ -e $CORE_PATH/Conf/target.txt ]; then + rm $CORE_PATH/Conf/target.txt fi =20 -if [ -e $(pwd)/Conf/BiosId.env ]; then - rm $(pwd)/Conf/BiosId.env +if [ -e $CORE_PATH/Conf/BiosId.env ]; then + rm $CORE_PATH/Conf/BiosId.env fi =20 -if [ -e $(pwd)/Conf/tools_def.txt ]; then - rm $(pwd)/Conf/tools_def.txt +if [ -e $CORE_PATH/Conf/tools_def.txt ]; then + rm $CORE_PATH/Conf/tools_def.txt fi =20 -if [ -e $(pwd)/Conf/build_rule.txt ]; then - rm $(pwd)/Conf/build_rule.txt +if [ -e $CORE_PATH/Conf/build_rule.txt ]; then + rm $CORE_PATH/Conf/build_rule.txt fi =20 - ## Setup EDK environment. Edksetup puts new copies of target.txt, tools_de= f.txt, build_rule.txt in WorkSpace\Conf ## Also run edksetup as soon as possible to avoid it from changing environ= ment variables we're overriding . edksetup.sh BaseTools @@ -64,8 +72,9 @@ make -C BaseTools =20 ## Define platform specific environment variables. PLATFORM_PACKAGE=3DVlv2TbltDevicePkg -config_file=3D$WORKSPACE/$PLATFORM_PACKAGE/PlatformPkgConfig.dsc -auto_config_inc=3D$WORKSPACE/$PLATFORM_PACKAGE/AutoPlatformCFG.txt +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 ## create new AutoPlatformCFG.txt file if [ -f "$auto_config_inc" ]; then @@ -112,10 +121,10 @@ fi =20 ## Remove the values for Platform_Type and Build_Target from BiosIdX.env a= nd stage in Conf if [ $Arch =3D=3D "IA32" ]; then - cp $PLATFORM_PACKAGE/BiosIdR.env Conf/BiosId.env + cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env echo DEFINE X64_CONFIG =3D FALSE >> $auto_config_inc else - cp $PLATFORM_PACKAGE/BiosIdx64R.env Conf/BiosId.env + cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env echo DEFINE X64_CONFIG =3D TRUE >> $auto_config_inc fi sed -i '/^BOARD_ID/d' Conf/BiosId.env @@ -142,11 +151,11 @@ fi Platform_Type=3D$1 =20 if [ "$(echo $2 | tr 'a-z' 'A-Z')" =3D=3D "RELEASE" ]; then - TARGET=3DRELEASE + export TARGET=3DRELEASE BUILD_TYPE=3DR echo BUILD_TYPE =3D R >> Conf/BiosId.env else - TARGET=3DDEBUG + export TARGET=3DDEBUG BUILD_TYPE=3DD echo BUILD_TYPE =3D D >> Conf/BiosId.env fi @@ -157,7 +166,7 @@ fi ##********************************************************************** echo "Ensuring correct build directory is present for GenBiosId..." =20 -echo Modifing Conf files for this build... +echo Modifying Conf files for this build... ## Remove lines with these tags from target.txt sed -i '/^ACTIVE_PLATFORM/d' Conf/target.txt sed -i '/^TARGET /d' Conf/target.txt @@ -182,8 +191,8 @@ case $gcc_version in ;; esac =20 -ACTIVE_PLATFORM=3D$PLATFORM_PACKAGE/PlatformPkgGcc"$Arch".dsc -TOOL_CHAIN_TAG=3D$TARGET_TOOLS +ACTIVE_PLATFORM=3D$PLATFORM_PKG_PATH/PlatformPkgGcc"$Arch".dsc +export TOOL_CHAIN_TAG=3D$TARGET_TOOLS MAX_CONCURRENT_THREAD_NUMBER=3D1 echo ACTIVE_PLATFORM =3D $ACTIVE_PLATFORM >> Con= f/target.txt echo TARGET =3D $TARGET >> Con= f/target.txt --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43503): https://edk2.groups.io/g/devel/message/43503 Mute This Topic: https://groups.io/mt/32419736/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-