From nobody Thu May 16 16:29:14 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+110110+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+110110+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1698332389; cv=none; d=zohomail.com; s=zohoarc; b=h9eH2/7kCmkQQi0ECgMZJFWw3g1Fb16nR7qjt3rUCMZ3fQwxVOM4Zd0WBJ+QV6MX1LdmcbUpjJcEcABmXDcxExgxnwYYodt3TjZh0i/WMFDahgh/WzTgHyWb0pC6PzA56G9yt3z2Gy5FOtkz9dWoUBPY+0Wu7P/ecebGg0bUEDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698332389; 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=CH9Rq8N7mh5xOPdr93jMZPoTCTmPYPiMLB4LUYdI9IM=; b=KQ4FbCu7t/KMuc0WbBIyMjY147y7ws905PY2hEsdJeCn4jNgwc7cONrS/CGk9Kne9Qff4UwUY/xnmXWVsjpmKEIahUvLRWGFi9pvi/TPycxsi0AF8EWN5YMUwWzQo4YQS5YPxSOy9GheNVUDCqdDsNn243D/Vt84pPR0HdsB5z0= 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+110110+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 169833238897821.604183464787184; Thu, 26 Oct 2023 07:59:48 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=SsuIuyj5aFI9DJinXFSczEQlrI+I/CRpuzrKfXh6WSQ=; 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=1698332388; v=1; b=UnsVHqUvLdy83YKbAzRz1XCth42EZx1AyKjv7FOmYg5DMrbn1+0Q0gcwt5mylghbhlSd+akh Fl26Qlt5VtoqSXQ80qGtqVgKigMN6PZ735Z4YSfNOcXLv8dgrT2/2h2ivM+wit3fb7vsuR/Oc4H +a5AmmyXals4DX9WgHTMJX7I= X-Received: by 127.0.0.2 with SMTP id PXcUYY1788612x342kTX2S95; Thu, 26 Oct 2023 07:59:48 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.64344.1698300546865500546 for ; Wed, 25 Oct 2023 23:09:07 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="387293760" X-IronPort-AV: E=Sophos;i="6.03,253,1694761200"; d="scan'208";a="387293760" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Oct 2023 23:09:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10874"; a="882707732" X-IronPort-AV: E=Sophos;i="6.03,253,1694761200"; d="scan'208";a="882707732" X-Received: from unknown (HELO juichenx-mobl3.gar.corp.intel.com) ([10.227.107.35]) by orsmga004.jf.intel.com with ESMTP; 25 Oct 2023 23:09:04 -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 v1 1/1] UefiPayloadPkg: Fix incorrect code on Fit function. Date: Thu, 26 Oct 2023 14:08:46 +0800 Message-Id: <20231026060847.2168-2-brucex.wang@intel.com> In-Reply-To: <20231026060847.2168-1-brucex.wang@intel.com> References: <20231026060847.2168-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: MInj70pArpb4Vm4D3ZlBScfDx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1698332391034100002 Content-Type: text/plain; charset="utf-8" From: "Brucex.Wang" 1. MultiImage[Index] should be deleted if fv path of MultiImage[Index] not = exist. 2. Remove redundant code. Cc: Guo Dong Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: BruceX Wang --- UefiPayloadPkg/Tools/MkFitImage.py | 2 ++ UefiPayloadPkg/UniversalPayloadBuild.py | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/UefiPayloadPkg/Tools/MkFitImage.py b/UefiPayloadPkg/Tools/MkFi= tImage.py index 82ab933d6d..afa1630244 100644 --- a/UefiPayloadPkg/Tools/MkFitImage.py +++ b/UefiPayloadPkg/Tools/MkFitImage.py @@ -130,6 +130,8 @@ def BuildFitImage(Fdt, InfoHeader): MultiImage[Index][-2] =3D BinaryData MultiImage[Index][-1] =3D DataOffset DataOffset +=3D len (BinaryData) + else: + del MultiImage[Index] libfdt.fdt_setprop_u32(Fdt, 0, 'size', DataOffset) posix_time =3D int(time.time()) libfdt.fdt_setprop_u32(Fdt, 0, 'timestamp', posix_time) 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.1.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 (#110110): https://edk2.groups.io/g/devel/message/110110 Mute This Topic: https://groups.io/mt/102201551/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-