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.web09.8337.1574261675311264621 for ; Wed, 20 Nov 2019 06:54:35 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: liming.gao@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2019 06:54:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,222,1571727600"; d="scan'208";a="200740554" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga008.jf.intel.com with ESMTP; 20 Nov 2019 06:54:34 -0800 Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 06:54:34 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 06:54:33 -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; Wed, 20 Nov 2019 22:54:31 +0800 From: "Liming Gao" To: "Fan, ZhijuX" , "devel@edk2.groups.io" CC: "Feng, Bob C" Subject: Re: [PATCH] BaseTools:fix regression issue for platform .map file Thread-Topic: [PATCH] BaseTools:fix regression issue for platform .map file Thread-Index: AdWfijyxPCDr+aX3RFSLUzqUke7lwAAKAedg Date: Wed, 20 Nov 2019 14:54:31 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E54431A@SHSMSX104.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDk1N2I5ZjMtMjVkZi00NzdiLWEyMGQtMTAxMTg5MjVhNWE4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiN3FoK0k2XC9TcUJrQzYzQnRRSDZheUh5WUlPSHBzSEN0Mnd2bGZVbXZTQThiY0tmZzBKSkNBQytxYzRPV0VsREoifQ== dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Does this fix only impact Platform.map generation? If so, I prefer to catch= it into this stable tag.=20 Thanks Liming > -----Original Message----- > From: Fan, ZhijuX > Sent: Wednesday, November 20, 2019 6:07 PM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Feng, Bob C > Subject: [PATCH] BaseTools:fix regression issue for platform .map file >=20 > BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2363 >=20 > The line of IMAGE=3D*** is missing in platform .map file.For example, > in Ovmf.map, there is no line of (IMAGE=3D ) under each of modules item. > This is a regression issue. >=20 > this patch is going to fix this issue >=20 > Cc: Liming Gao > Cc: Bob Feng > Signed-off-by: Zhiju.Fan > --- > BaseTools/Source/Python/build/build.py | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Py= thon/build/build.py > index bcd832c525..e24f040a93 100755 > --- a/BaseTools/Source/Python/build/build.py > +++ b/BaseTools/Source/Python/build/build.py > @@ -2216,6 +2216,7 @@ class Build(): > Wa, self.BuildModules =3D self.PerformAutoGen(BuildT= arget,ToolChain) > Pa =3D Wa.AutoGenObjectList[0] > GlobalData.gAutoGenPhase =3D False > + self.LoadFixAddress =3D Wa.Platform.LoadFixAddress >=20 > if GlobalData.gBinCacheSource: > EdkLogger.quiet("Total cache hit driver num: %s, cac= he miss driver num: %s" % (len(set(self.HashSkipModules)), > len(set(self.BuildModules)))) > @@ -2267,6 +2268,10 @@ class Build(): > self.CreateAsBuiltInf() > if GlobalData.gBinCacheDest: > self.UpdateBuildCache() > + # > + # Get Module List > + # > + ModuleList =3D {ma.Guid.upper(): ma for ma in self.Build= Modules} > self.BuildModules =3D [] > self.MakeTime +=3D int(round((time.time() - MakeContiue)= )) > # > @@ -2285,10 +2290,6 @@ class Build(): > # > if (Arch =3D=3D 'IA32' or Arch =3D=3D 'ARM') and= self.LoadFixAddress !=3D 0xFFFFFFFFFFFFFFFF and > self.LoadFixAddress >=3D 0x100000000: > EdkLogger.error("build", PARAMETER_INVALID, = "FIX_LOAD_TOP_MEMORY_ADDRESS can't be set to > larger than or equal to 4G for the platorm with IA32 or ARM arch modules"= ) > - # > - # Get Module List > - # > - ModuleList =3D {ma.Guid.upper():ma for ma in self.Bu= ildModules} >=20 > # > # Rebase module to the preferred memory address befo= re GenFds > -- > 2.14.1.windows.1