From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.11972.1687357443503487776 for ; Wed, 21 Jun 2023 07:24:03 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=fqWaDuKE; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: yuwei.chen@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687357443; x=1718893443; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=1Rrv0uNk39qG1ml5kkEfXYhYjAiJ9tYmCaFbXQT20Ms=; b=fqWaDuKEx3GbDTewUyzrsDD+I0EbRsNTRnVCQCDN1qGu9UQMfLJzqT+9 WaQVYQCGrHVh+d+Xzvnaea++2YHS86K9cUN1KkL46RktAEAGEi2AVaNKs CmLJJKGyc0b/UZKnqGrj72z2u9esgyFgkqRTLgSTAx9AS1ed6s7yNfmmI qFwAgCO//BJxPon/UtH+ZLKXXCbRcOy5Pphl1IP893nUhiBZqxAHYwmmz vwcahVGjOj01JIi8472lky09r7LkXacNcdhLlx6xPmxeib2kdzoMRtj4g gJav8cvh7jIPd2aVldPFHZkV7qoqs8e1oC8uHFOOCA4xvr/eGCflH8/G8 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="339802943" X-IronPort-AV: E=Sophos;i="6.00,260,1681196400"; d="scan'208";a="339802943" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2023 07:24:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10748"; a="838629383" X-IronPort-AV: E=Sophos;i="6.00,260,1681196400"; d="scan'208";a="838629383" Received: from yuweipc.ccr.corp.intel.com ([10.239.158.24]) by orsmga004.jf.intel.com with ESMTP; 21 Jun 2023 07:24:01 -0700 From: "Yuwei Chen" To: devel@edk2.groups.io Cc: Rebecca Cran , Liming Gao , Bob Feng Subject: [Patch V2] [edk2-staging] BaseTools/FMMT: C FMMT match new version machine defines Date: Wed, 21 Jun 2023 22:23:57 +0800 Message-Id: <20230621142357.1260-1-yuwei.chen@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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(-) Update V2 for correct conditional checking. diff --git a/BaseTools/Source/C/FMMT/Rebase.c b/BaseTools/Source/C/FMMT/Reb= ase.c index d32217d18c..ba1429d73a 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;=0D }=0D =0D - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) ||=0D - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) {=0D + //if ((ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARMT) ||=0D + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_AARCH64)) {=0D // mArm =3D TRUE;=0D //}=0D =0D @@ -435,8 +435,8 @@ EFI_NOT_FOUND No compressed sections could be= found. return Status;=0D }=0D =0D - //if ((ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_ARMT) ||=0D - // (ImageContext.Machine =3D=3D EFI_IMAGE_MACHINE_AARCH64)) {=0D + //if ((ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_ARMT) ||=0D + // (ImageContext.Machine =3D=3D IMAGE_FILE_MACHINE_AARCH64)) {=0D // mArm =3D TRUE;=0D //}=0D =0D @@ -835,8 +835,8 @@ Returns: //=0D // Verify machine type is supported=0D //=0D - if ((*MachineType !=3D EFI_IMAGE_MACHINE_IA32) && (*MachineType !=3D EFI= _IMAGE_MACHINE_X64) && (*MachineType !=3D EFI_IMAGE_MACHINE_EBC) &&=0D - (*MachineType !=3D EFI_IMAGE_MACHINE_ARMT) && (*MachineType !=3D EFI= _IMAGE_MACHINE_AARCH64)) {=0D + if ((*MachineType !=3D IMAGE_FILE_MACHINE_I386) && (*MachineType !=3D IM= AGE_FILE_MACHINE_X64) && (*MachineType !=3D IMAGE_FILE_MACHINE_EBC) &&=0D + (*MachineType !=3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED) && (*MachineTy= pe !=3D IMAGE_FILE_MACHINE_ARM64 )) {=0D Error (NULL, 0, 3000, "Invalid", "Unrecognized machine type in the PE3= 2 file.");=0D return EFI_UNSUPPORTED;=0D }=0D --=20 2.27.0.windows.1