From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Wed, 10 Jul 2019 12:05:22 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False 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="171008166" 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-platforms Patch 08/28] Vlv2TbltDevicePkg/bld_vlv.sh: Remove BiosId.env completely Date: Wed, 10 Jul 2019 12:04:56 -0700 Message-Id: <20190710190516.6012-9-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190710190516.6012-1-michael.d.kinney@intel.com> References: <20190710190516.6012-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Gary Lin Cc: Zailiang Sun Cc: Yi Qian Cc: Michael D Kinney Signed-off-by: Gary Lin --- Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh | 25 +++------------------ 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh index 0aa1edfb22..bceea99b2d 100755 --- a/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh +++ b/Platform/Intel/Vlv2TbltDevicePkg/bld_vlv.sh @@ -53,10 +53,6 @@ if [ -e $CORE_PATH/Conf/target.txt ]; then rm $CORE_PATH/Conf/target.txt fi -if [ -e $CORE_PATH/Conf/BiosId.env ]; then - rm $CORE_PATH/Conf/BiosId.env -fi - if [ -e $CORE_PATH/Conf/tools_def.txt ]; then rm $CORE_PATH/Conf/tools_def.txt fi @@ -119,18 +115,11 @@ if [ "$2" == "" ]; then Usage fi -## Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf if [ $Arch == "IA32" ]; then - cp $PLATFORM_PKG_PATH/BiosIdR.env Conf/BiosId.env - echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc + echo DEFINE X64_CONFIG = FALSE >> $auto_config_inc else - cp $PLATFORM_PKG_PATH/BiosIdx64R.env Conf/BiosId.env - echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc + echo DEFINE X64_CONFIG = TRUE >> $auto_config_inc fi -sed -i '/^BOARD_ID/d' Conf/BiosId.env -sed -i '/^BUILD_TYPE/d' Conf/BiosId.env - - ## -- Build flags settings for each Platform -- ## AlpineValley (ALPV): SVP_PF_BUILD = TRUE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = FALSE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE @@ -141,26 +130,18 @@ sed -i '/^BUILD_TYPE/d' Conf/BiosId.env ## FFD8 (BLAK): SVP_PF_BUILD = FALSE, ENBDT_PF_BUILD = FALSE, TABLET_PF_BUILD = TRUE, BYTI_PF_BUILD = FALSE, IVI_PF_BUILD = FALSE echo "Setting $1 platform configuration and BIOS ID..." if [ "$(echo $1 | tr 'a-z' 'A-Z')" == "MNW2" ]; then - echo BOARD_ID = MNW2MAX >> Conf/BiosId.env - echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc + echo DEFINE ENBDT_PF_BUILD = TRUE >> $auto_config_inc else echo "Error - Unsupported PlatformType: $1" Usage fi -Platform_Type=$1 - if [ "$(echo $2 | tr 'a-z' 'A-Z')" == "RELEASE" ]; then export TARGET=RELEASE - BUILD_TYPE=R - echo BUILD_TYPE = R >> Conf/BiosId.env else export TARGET=DEBUG - BUILD_TYPE=D - echo BUILD_TYPE = D >> Conf/BiosId.env fi - ##********************************************************************** ## Additional EDK Build Setup/Configuration ##********************************************************************** -- 2.21.0.windows.1