From nobody Sat May 11 13:38:57 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+106416+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+106416+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1687834416; cv=none; d=zohomail.com; s=zohoarc; b=ENsQ//wbK20N39i3Naej/8WvNJxlnu3BK+r6kkXg8MvpfOvClMZr9Zd9vZCwmw5xRnLGc1Go7nPLJDXeuavC5h0YJfBlZbaCMm5nTAHjVLQT/ejKDpxMFGk4ov5AH29SJc8yheQNCkFtk4gSdxuwZO83BJnwaMdCwCK3u8FVJtM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687834416; 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=8lCb78t1bsUeQfi63HxJ/rIoTRYYX6Uo+FbvtVGRyE8=; b=YBqY4IFCsEK6GXt3UhuFUP8xzz5DRqdDpDJhiNdwh7N15Nv2rfI7NR89x8fEg93ynwXNT2vFzGYaRIXXp6D7aUsVEPlbMJUZMEr3KdSWKgiUHDbcigLVjsZkY7mcR1/pN1FvBJtmPacmDKw/HQTmdAr+g8h/VQR9L+aWID7OUPI= 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+106416+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 1687834416248845.9898943940451; Mon, 26 Jun 2023 19:53:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ju7DYY1788612xrnEpCz2fd5; Mon, 26 Jun 2023 19:53:35 -0700 X-Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.1549.1687834414613945551 for ; Mon, 26 Jun 2023 19:53:35 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="360318943" X-IronPort-AV: E=Sophos;i="6.01,161,1684825200"; d="scan'208";a="360318943" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jun 2023 19:53:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10753"; a="1046739407" X-IronPort-AV: E=Sophos;i="6.01,161,1684825200"; d="scan'208";a="1046739407" X-Received: from yuweipc.ccr.corp.intel.com ([10.239.158.24]) by fmsmga005.fm.intel.com with ESMTP; 26 Jun 2023 19:53:32 -0700 From: "Yuwei Chen" To: devel@edk2.groups.io Cc: Rebecca Cran , Liming Gao , Bob Feng Subject: [edk2-devel] [Patch V3] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines Date: Tue, 27 Jun 2023 10:53:30 +0800 Message-Id: <20230627025330.1579-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: rhETOepolPYLKhoNZlzvvXyOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1687834415; bh=L//YZbndTt7qY43RHMHhFOgQKLexAJrr3iWBQXjcOIc=; h=Cc:Date:From:Reply-To:Subject:To; b=KIkYz3OoLsmBNxMcJEYA1EZy5I+q/NF3UuHPcnAfdbBThAyHdLpidg7vDPYvjD6gdYg q7PegM15a+VIXl5unnf6pM4zcEN+HTsWexgk4wx3XI5tDRP/Fih0KE0PoIBKGNKNNLSL1 K42e5j921efIT9LW+ursXzuozyxXFyKTCXs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1687834418476100003 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 Reviewed-by: Liming Gao --- V3 modify the patch with the correct define 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..20f8e5a3fc 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_ARMTHUMB_MIXED) = || + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARM64)) { // 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_ARMTHUMB_MIXED) = || + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARM64)) { // 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_I386) && (*MachineType !=3D IM= AGE_FILE_MACHINE_X64) && (*MachineType !=3D IMAGE_FILE_MACHINE_EBC) && + (*MachineType !=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) && (*MachineTy= pe !=3D IMAGE_FILE_MACHINE_ARM64)) { Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the PE3= 2 file."); return EFI_UNSUPPORTED; } --=20 2.27.0.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 (#106416): https://edk2.groups.io/g/devel/message/106416 Mute This Topic: https://groups.io/mt/99802865/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-