From nobody Sun Feb 8 20:23:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87347+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87347+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1646723259; cv=none; d=zohomail.com; s=zohoarc; b=XJ4gJo8E1CSoa4+5fLkVQHeePhcN04dp9u9SZ8U9QWjqFeA1M6WuHcJNyTcXBAZnfueComlK/3op0wUEWcYMJzT4C3A4q66uAQZT58exqB5BNGzdiWIQkPcAH4eu1YhJsI8NY8dDhveVzHPsv6cR5/OiNgoVQXRg7+qaCn9cpqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646723259; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ve4Xp5gyGdHFJv/HWbKnAbQi2goesu6Uc7De5LcRguI=; b=VuC3n+kIN5jHwmlqHNUcrR826wOvpyzuULTIBWpjtYUbBm59JQsOEp6GIZiZqJsG2tTuYjeucU8XgBDiS1Lb7hPpt2Wo+L0qkED23SlE0WDiYR3Q6sYnwTQDhDV0XHI7H4DqZHUOVOSXb9jJL+UJ7p7u329NfEEaBHiDzcT7Dok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87347+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1646723259592651.7867850953403; Mon, 7 Mar 2022 23:07:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JXMvYY1788612xhI57XiPUcD; Mon, 07 Mar 2022 23:07:39 -0800 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web10.5832.1646723252884649804 for ; Mon, 07 Mar 2022 23:07:38 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10279"; a="254802534" X-IronPort-AV: E=Sophos;i="5.90,163,1643702400"; d="scan'208";a="254802534" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 23:07:38 -0800 X-IronPort-AV: E=Sophos;i="5.90,163,1643702400"; d="scan'208";a="643557486" X-Received: from shwdejointd178.ccr.corp.intel.com ([10.239.153.103]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2022 23:07:36 -0800 From: "yi1 li" To: devel@edk2.groups.io Cc: yi1 li , Bob Feng , Liming Gao , Heng Luo Subject: [edk2-devel] [PATCH 2/2] BaseTools:Add the FeatureFlagExpression usage to the Source Section Date: Tue, 8 Mar 2022 15:07:11 +0800 Message-Id: <4a24df439a87ae36383a0e14b0b46c4ef63db96c.1646721943.git.yi1.li@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,yi1.li@intel.com X-Gm-Message-State: 4t9afv4RuTmphrMV3hd09LDZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1646723259; bh=LmjfnVd3zTLEnYSS47kfC0XvnYFO0uFQtlygtMNNrmI=; h=Cc:Date:From:Reply-To:Subject:To; b=ZEZZMuv9iwB/tStV2sZv6oyjksC6mET2JXw8nJxFq8+Jz0TutnjUMs2DM7YQEOS/YNs h9YxuWxjk5H5rkNQNhgJyPsYYsxKxbnW7I5PLhk1yfJgFI8uLYpb6SN7A7IooRGXaxbsr mkjrap//u1vxbnTUmnLNv6dBpEpgz+NMNUg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1646723261748100001 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1446 FeatureFlagExpression Support in Source section of INF file. The Pcd value in the expression is from INF or DEC. When a FeatureFlagExpression is present,if the expression evaluates to TRUE,then the entry is valid. If the expression evaluates to FALSE, then the EDK II build tools must ignore the entry. This patch is going to add this feature. Cc: Bob Feng Cc: Liming Gao Cc: Heng Luo Signed-off-by: yi1 li --- .../Source/Python/Workspace/InfBuildData.py | 16 +++++++++++----- .../Source/Python/Workspace/MetaFileParser.py | 4 ++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/= Source/Python/Workspace/InfBuildData.py index 9643bf17ac63..da5d3f0dc93c 100644 --- a/BaseTools/Source/Python/Workspace/InfBuildData.py +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py @@ -529,11 +529,17 @@ class InfBuildData(ModuleBuildClassObject): for Record in RecordList: LineNo =3D Record[-1] ToolChainFamily =3D Record[1] - TagName =3D Record[2] - ToolCode =3D Record[3] - + # OptionsList :=3D [TagName, ToolCode, FeatureFlag] + OptionsList =3D ['','',''] + TokenList =3D GetSplitValueList(Record[2], TAB_VALUE_SPLIT) + for Index in range(len(TokenList)): + OptionsList[Index] =3D TokenList[Index] + if OptionsList[2]: + FeaturePcdExpression =3D self.CheckFeatureFlagPcd(OptionsL= ist[2]) + if not FeaturePcdExpression: + continue File =3D PathClass(NormPath(Record[0], Macros), self._ModuleDi= r, '', - '', False, self._Arch, ToolChainFamily, '', T= agName, ToolCode) + '', False, self._Arch, ToolChainFamily, '', O= ptionsList[0], OptionsList[1]) # check the file validation ErrorCode, ErrorInfo =3D File.Validate() if ErrorCode !=3D 0: @@ -1067,7 +1073,7 @@ class InfBuildData(ModuleBuildClassObject): return True return False def CheckFeatureFlagPcd(self,Instance): - Pcds =3D GlobalData.gPlatformFinalPcds[self.Arch].copy() + Pcds =3D self._GetPcd(MODEL_PCD_FIXED_AT_BUILD) if PcdPattern.search(Instance): PcdTuple =3D tuple(Instance.split('.')[::-1]) if PcdTuple in self.Pcds: diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index a3b6edbd15ee..3508591b281e 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -736,6 +736,10 @@ class InfParser(MetaFileParser): @ParseMacro def _SourceFileParser(self): TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT) + # Let TokenList[2] be TagName|ToolCode|FeatureFlag + if len(TokenList) > 3: + for extraToken in range(3, len(TokenList)): + TokenList[2] =3D TokenList[2] + '|' + TokenList[extraToken] self._ValueList[0:len(TokenList)] =3D TokenList Macros =3D self._Macros # For Acpi tables, remove macro like ' TABLE_NAME=3DSata1' --=20 2.33.0.windows.2 -=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 (#87347): https://edk2.groups.io/g/devel/message/87347 Mute This Topic: https://groups.io/mt/89632331/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-