From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id EF1B29419BA for ; Sat, 28 Oct 2023 18:48:46 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=BS8J6uNNDPkgL1E4Ya+nwjfy5F01Rvm/lQy1lsLAEgQ=; 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=QCR1mfxM7avldBTZ1V6LiFFCgtuUm0g+uGRa8uvXjIomU62wOg043aEBQ2Bo/t0ekRMgTUlg +kaQZyDqIVzRqARGIx3srePCVM/LQ5r/30F4CoNav3KiB1ZcOEm9djIldO4AUTkcYWWGpVyH+7V G6do9FzZ3SMMTvB+oI/Yek5g= X-Received: by 127.0.0.2 with SMTP id axR1YY7687511xOOOgBC6629; 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: csUDL5e9ob57MG0VjXVncp7Nx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=QCR1mfxM; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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 --- 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=0D from ctypes import *=0D import time=0D +import os=0D =0D class FIT_IMAGE_INFO_HEADER:=0D """Class for user setting data to use MakeFitImage()=0D @@ -139,6 +140,8 @@ def BuildFitImage(Fdt, InfoHeader): ImageNode =3D libfdt.fdt_add_subnode(Fdt, 0, 'images')=0D for Item in reversed (MultiImage):=0D Name, Path, BuildFvNode, Description, BinaryData, DataOffset =3D I= tem=0D + if os.path.exists (Item[1]) =3D=3D False:=0D + continue=0D FvNode =3D libfdt.fdt_add_subnode(Fdt, ImageNode, Name)=0D BuildFvNode (Fdt, InfoHeader, FvNode, DataOffset, len(BinaryData),= Description)=0D =0D @@ -149,7 +152,9 @@ def BuildFitImage(Fdt, InfoHeader): DtbFile.truncate()=0D DtbFile.write(Fdt)=0D for Item in MultiImage:=0D - _, _, _, _, BinaryData, _ =3D Item=0D + _, FilePath, _, _, BinaryData, _ =3D Item=0D + if os.path.exists (Item[1]) =3D=3D False:=0D + continue=0D DtbFile.write(BinaryData)=0D DtbFile.close()=0D =0D 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")=0D UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin")=0D =0D - if "CLANG_BIN" in os.environ:=0D - LlvmObjcopyPath =3D os.path.join(os.environ["CLANG_BIN"], "llvm-ob= jcopy")=0D - else:=0D - LlvmObjcopyPath =3D "llvm-objcopy"=0D - try:=0D - RunCommand('"%s" --version'%LlvmObjcopyPath)=0D - except:=0D - print("- Failed - Please check if LLVM is installed or if CLANG_BI= N is set correctly")=0D - sys.exit(1)=0D -=0D Pcds =3D ""=0D if (Args.pcd !=3D None):=0D for PcdItem in Args.pcd:=0D --=20 2.39.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-