From nobody Tue May 14 14:25:53 2024 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+110252+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+110252+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1698518926; cv=none; d=zohomail.com; s=zohoarc; b=Hg7wsQVucIHFjtApwN6uKMN3EiYsZ58J9eT6NY0xn4VBlz7NqiYtw5JrEDVq28Qj72N4nk9Fk9TJIXou7VVJSl7PBYTjMZIicPmRLn7MOdPGjE9hLFxVUtRQu7zBUdvwMkxckAWW+qKxoQ4aRHiA4qFGtO8GdYibsphhGaRb/C8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698518926; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=O4KD+Kc2o3gm0fSLf+rX81tImSYOaCAM8IPmwcEJzeM=; b=cTAx9Qzlda6yyNhchaRcvXodWGeywWh/SfLKv/nKF4P0FMo00zCSgZxKiOPWjYDVf3nK1y5Hg/7mq/8qZA6W/azf1buqdkuN0H/4ble4PXbQnGWRRTy5novGYi6/zRLgwu3acakqNShkJjlxi1778lhqFxrwkZ2wcT5IsIQhjrM= 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+110252+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 1698518926231433.1247351484295; Sat, 28 Oct 2023 11:48:46 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=6pk0zndNk49RbtNdm1xRvpSkP4dSYgk6eu5Dfn0UWbU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1698518925; v=1; b=Z+3o7wAZ6Ohg71Rp0O0G9U0+Ll9IQsuE/UGHXCZMzTQnulAghQ6KsPoQYo4tdy9SO8q6mGRt aIc+b/UuzNVAwBnvMiThWHUiOoIrqtEYfreT2bM+IirlWKSMGpGNbxeY82Z7xI9vFJlSgrMeuME eiAYhE/6qDoqG6tlGMLMCEzk= X-Received: by 127.0.0.2 with SMTP id jHvbYY1788612x3DUYKkFKzi; Sat, 28 Oct 2023 11:48:45 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by mx.groups.io with SMTP id smtpd.web10.30716.1698448367093000619 for ; Fri, 27 Oct 2023 16:12:48 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10876"; a="690529" X-IronPort-AV: E=Sophos;i="6.03,257,1694761200"; d="scan'208";a="690529" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2023 16:12:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,257,1694761200"; d="scan'208";a="7359629" X-Received: from gguo-desk.gar.corp.intel.com ([10.5.215.23]) by orviesa001.jf.intel.com with ESMTP; 27 Oct 2023 16:11:23 -0700 From: brucex.wang@intel.com To: devel@edk2.groups.io Cc: brucex.wang@intel.com, Guo Dong , Sean Rhodes , James Lu , Gua Guo Subject: [edk2-devel] [PATCH v2 1/1] UefiPayloadPkg: Fix incorrect code on Fit function. Date: Sat, 28 Oct 2023 07:12:35 +0800 Message-Id: <20231027231235.2043-2-brucex.wang@intel.com> In-Reply-To: <20231027231235.2043-1-brucex.wang@intel.com> References: <20231027231235.2043-1-brucex.wang@intel.com> MIME-Version: 1.0 Precedence: Bulk 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,brucex.wang@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: l4ijOsAQQqDaBUI7uAJrIlFix1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1698518927159100002 Content-Type: text/plain; charset="utf-8" From: BruceX Wang 1. Add firmware volume need to check firmware volume exist or not. 2. Remove clang version check dependency. Cc: Guo Dong Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: BruceX Wang Reviewed-by: Gua Guo --- UefiPayloadPkg/Tools/MkFitImage.py | 7 ++++++- UefiPayloadPkg/UniversalPayloadBuild.py | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/UefiPayloadPkg/Tools/MkFitImage.py b/UefiPayloadPkg/Tools/MkFi= tImage.py index 82ab933d6d..41a259960b 100644 --- a/UefiPayloadPkg/Tools/MkFitImage.py +++ b/UefiPayloadPkg/Tools/MkFitImage.py @@ -10,6 +10,7 @@ from os.path import exists import libfdt from ctypes import * import time +import os =20 class FIT_IMAGE_INFO_HEADER: """Class for user setting data to use MakeFitImage() @@ -139,6 +140,8 @@ def BuildFitImage(Fdt, InfoHeader): ImageNode =3D libfdt.fdt_add_subnode(Fdt, 0, 'images') for Item in reversed (MultiImage): Name, Path, BuildFvNode, Description, BinaryData, DataOffset =3D I= tem + if os.path.exists (Item[1]) =3D=3D False: + continue FvNode =3D libfdt.fdt_add_subnode(Fdt, ImageNode, Name) BuildFvNode (Fdt, InfoHeader, FvNode, DataOffset, len(BinaryData),= Description) =20 @@ -149,7 +152,9 @@ def BuildFitImage(Fdt, InfoHeader): DtbFile.truncate() DtbFile.write(Fdt) for Item in MultiImage: - _, _, _, _, BinaryData, _ =3D Item + _, FilePath, _, _, BinaryData, _ =3D Item + if os.path.exists (Item[1]) =3D=3D False: + continue DtbFile.write(BinaryData) DtbFile.close() =20 diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index 6f57fa6df6..046c62e21c 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -146,16 +146,6 @@ def BuildUniversalPayload(Args): ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") =20 - if "CLANG_BIN" in os.environ: - LlvmObjcopyPath =3D os.path.join(os.environ["CLANG_BIN"], "llvm-ob= jcopy") - else: - LlvmObjcopyPath =3D "llvm-objcopy" - try: - RunCommand('"%s" --version'%LlvmObjcopyPath) - except: - print("- Failed - Please check if LLVM is installed or if CLANG_BI= N is set correctly") - sys.exit(1) - Pcds =3D "" if (Args.pcd !=3D None): for PcdItem in Args.pcd: --=20 2.39.2.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 (#110252): https://edk2.groups.io/g/devel/message/110252 Mute This Topic: https://groups.io/mt/102244780/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-