From nobody Thu May 16 18:50:45 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+106131+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+106131+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1686879223; cv=none; d=zohomail.com; s=zohoarc; b=TfHGOE3pcrfRzIwW2kDLj5YWCzfLja4bSo3pavAlhhsCcho+klXRB5bkFSEJlOK/GE3IEMZ3eB15CLh8zRY5gld0sdN17/wss3Sp8b4eJqqDEg3RauNTEYRtkfRNmcl39IMkSQOzay07rOpbmHX+3wENnBqPSssCmLk3HeKYTvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686879223; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=JkxVSqbklgv7ICD4YvjCTYl/w9Tcsi1aNVICQ2Njj9w=; b=ZW16LIvyMVrzpUkOGuY/Ul7tJe18CKTbFX1lyu5M6WX7Ovd/D+UVf3yL+K6jNE5kP4IVqGmmo1vDMaEq+fzDU0a/GWIJLSirXvCjSVhhCRRbe08XNBZa2yrsEFaHmqFGp+KzVmywzSmmSW+Dal7SKvRF7CCwaymb5rmOL7EmmNY= 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+106131+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 1686879223173243.41161971217582; Thu, 15 Jun 2023 18:33:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1tPmYY1788612xhHGeTwt9E0; Thu, 15 Jun 2023 18:33:42 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.35245.1686879221529947414 for ; Thu, 15 Jun 2023 18:33:41 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="338704915" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="338704915" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2023 18:33:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10742"; a="690017197" X-IronPort-AV: E=Sophos;i="6.00,246,1681196400"; d="scan'208";a="690017197" X-Received: from yuweipc.ccr.corp.intel.com ([10.239.158.24]) by orsmga006.jf.intel.com with ESMTP; 15 Jun 2023 18:33:31 -0700 From: "Yuwei Chen" To: devel@edk2.groups.io Cc: Rebecca Cran , Liming Gao , Bob Feng Subject: [edk2-devel] [PATCH] [edk2-staging]BaseTools/FMMT: C FMMT match new version machine defines Date: Fri, 16 Jun 2023 09:33:28 +0800 Message-Id: <20230616013328.1506-1-yuwei.chen@intel.com> 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,yuwei.chen@intel.com X-Gm-Message-State: MVPbPj09G440OeKDFIj44Tj8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1686879222; bh=cdotxBsvZKcvNChhwcY/beC8Y9qv/cHvNme5+PrmNac=; h=Cc:Date:From:Reply-To:Subject:To; b=WAEXzj13t09kvMAmXygiZuZHnmauIculQP/YhUaBVyrJR+xix5Nz22G/6Il7WJMOSC1 D/spl5ml1O58xRNupRw1sn0o/My3gzmtjWF5JMQGAv3K6tkVeD2K3U/Wp11e0gKp3IaEk qe8RLfMIfr/Rff3f/H86HQOL9Mm3gDNJwOs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1686879223452100001 Content-Type: text/plain; charset="utf-8" BaseTools have switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_*. Thus, match the FCE & FMMT tool in edk2-staging repo with the new version define. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Signed-off-by: Yuwei Chen --- BaseTools/Source/C/FMMT/Rebase.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/BaseTools/Source/C/FMMT/Rebase.c b/BaseTools/Source/C/FMMT/Reb= ase.c index d32217d18c..059f39900d 100644 --- a/BaseTools/Source/C/FMMT/Rebase.c +++ b/BaseTools/Source/C/FMMT/Rebase.c @@ -159,8 +159,8 @@ EFI_NOT_FOUND No compressed sections could be= found. return Status; } =20 - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) || - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) { + //if ((ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARMT) || + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_AARCH64)) { // mArm =3D TRUE; //} =20 @@ -435,8 +435,8 @@ EFI_NOT_FOUND No compressed sections could be= found. return Status; } =20 - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) || - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) { + //if ((ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARMT) || + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_AARCH64)) { // mArm =3D TRUE; //} =20 @@ -835,8 +835,8 @@ Returns: // // Verify machine type is supported // - if ((*MachineType !=3D EFI_IMAGE_MACHINE_IA32) && (*MachineType !=3D EFI= _IMAGE_MACHINE_X64) && (*MachineType !=3D EFI_IMAGE_MACHINE_EBC) && - (*MachineType !=3D EFI_IMAGE_MACHINE_ARMT) && (*MachineType !=3D EFI= _IMAGE_MACHINE_AARCH64)) { + if ((*MachineType !=3D IMAGE_FILE_MACHINE_IA32) && (*MachineType !=3D IM= AGE_FILE_MACHINE_X64) && (*MachineType !=3D IMAGE_FILE_MACHINE_EBC) && + (*MachineType !=3D IMAGE_FILE_MACHINE_ARMT) && (*MachineType !=3D IM= AGE_FILE_MACHINE_AARCH64)) { Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the PE3= 2 file."); return EFI_UNSUPPORTED; } --=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 (#106131): https://edk2.groups.io/g/devel/message/106131 Mute This Topic: https://groups.io/mt/99562392/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-