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 E66BB941C02 for ; Thu, 26 Oct 2023 14:59:49 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=WvHyMmZlG7hiRzPuod1LAstjuiJxtCcssLp3sL3fb68=; 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=IXTcVeb/cf7oL6Nw4mqvrnVj7EcEwZ661uvKtOgYs/MF9vFtYDKLXvfvqDv7V/sHSf2McrS/ zn4W2fqV1vMngrgXpQQ8kK6fe+Hwz8JjL5arHEvSFyxzM5JfW8HpmSQl8BQQo9Chjxi43wJcYnN Ue1K9llVqyUC8U8uH3Buydqg= X-Received: by 127.0.0.2 with SMTP id UpvZYY7687511x21OUJFtZVn; 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: QQyaVNLTI982Ouo3g3TZGSiax7686176AA= 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="IXTcVeb/"; 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. 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=0D MultiImage[Index][-1] =3D DataOffset=0D DataOffset +=3D len (BinaryData)=0D + else:=0D + del MultiImage[Index]=0D libfdt.fdt_setprop_u32(Fdt, 0, 'size', DataOffset)=0D posix_time =3D int(time.time())=0D libfdt.fdt_setprop_u32(Fdt, 0, 'timestamp', posix_time)=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.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-