From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.5634.1574651022452969487 for ; Sun, 24 Nov 2019 19:03:42 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bob.c.feng@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Nov 2019 19:03:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,240,1571727600"; d="scan'208";a="260279733" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 24 Nov 2019 19:03:42 -0800 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 24 Nov 2019 19:03:41 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 24 Nov 2019 19:03:41 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.127]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.60]) with mapi id 14.03.0439.000; Mon, 25 Nov 2019 11:03:39 +0800 From: "Bob Feng" To: "Fan, ZhijuX" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [PATCH V3] BaseTools:fix regression issue for platform .map file Thread-Topic: [PATCH V3] BaseTools:fix regression issue for platform .map file Thread-Index: AdWhIzoMZ49KS9meT7ea2BQPhmBxuwCGbEUg Date: Mon, 25 Nov 2019 03:03:39 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D16156B40F@SHSMSX104.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Fan, ZhijuX=20 Sent: Friday, November 22, 2019 6:55 PM To: devel@edk2.groups.io Cc: Gao, Liming ; Feng, Bob C Subject: [PATCH V3] BaseTools:fix regression issue for platform .map file BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2363 This patch is to fix a build tool regression issue which was introduced by = commit b8ac0b7f28.This issue caused map file lost the line of IMAGE=3D***. For example,in Ovmf.map, there is no line of (IMAGE=3D ) under= each of modules item. The path to the efi file generated by each module is written on this line T= he purpose of this line is add the debug image full path. there is no information about the module in the map file other than FVName,= it allows us to quickly know which module this part corresponds to. In commit b8ac0b7f28,add a line ("self.BuildModules =3D []") in function, b= ut it's used to calculate the variable ModuleList in the following code. Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/build/build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index bcd832c525..07f1f21b5d 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2267,6 +2267,10 @@ class Build(): self.CreateAsBuiltInf() if GlobalData.gBinCacheDest: self.UpdateBuildCache() + # + # Get Module List + # + ModuleList =3D {ma.Guid.upper(): ma for ma in=20 + self.BuildModules} self.BuildModules =3D [] self.MakeTime +=3D int(round((time.time() - MakeContiue))) # @@ -2285,10 +2289,6 @@ class Build(): # if (Arch =3D=3D 'IA32' or Arch =3D=3D 'ARM') and s= elf.LoadFixAddress !=3D 0xFFFFFFFFFFFFFFFF and self.LoadFixAddress >=3D 0x1= 00000000: EdkLogger.error("build", PARAMETER_INVALID, "F= IX_LOAD_TOP_MEMORY_ADDRESS can't be set to larger than or equal to 4G for t= he platorm with IA32 or ARM arch modules") - # - # Get Module List - # - ModuleList =3D {ma.Guid.upper():ma for ma in self.Buil= dModules} =20 # # Rebase module to the preferred memory address before= GenFds -- 2.14.1.windows.1