From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web09.18083.1574301467758687852 for ; Wed, 20 Nov 2019 17:57:48 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: zhijux.fan@intel.com) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2019 17:57:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,224,1571727600"; d="dat'59?scan'59,208,59";a="200952237" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga008.jf.intel.com with ESMTP; 20 Nov 2019 17:57:46 -0800 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 17:57:46 -0800 Received: from shsmsx153.ccr.corp.intel.com (10.239.6.53) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 20 Nov 2019 17:57:46 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.213]) by SHSMSX153.ccr.corp.intel.com ([169.254.12.215]) with mapi id 14.03.0439.000; Thu, 21 Nov 2019 09:57:44 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH V2] BaseTools:fix regression issue for platform .map file Thread-Topic: [PATCH V2] BaseTools:fix regression issue for platform .map file Thread-Index: AdWgDwqWVsACakGySBmsVVoma+CTdw== Date: Thu, 21 Nov 2019 01:57:43 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMWIxZjE2NjItMmU5My00ZmY4LWExOTctYjc3MGZmZWUwYzk4IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiS2ZLaWV0bnFYR21YcVwvR0xRR0s5dDlWOHRtZHNpcFVPWURSUGxaSTNcL2pYRTVUWGhqaUY1dkZvSTk5elVNWjF0In0= 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: zhijux.fan@intel.com X-Groupsio-MsgNum: 50989 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFE182ASHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFE182ASHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2363 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. this patch is going to fix this issue 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 self.BuildMo= dules} 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 --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFE182ASHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IqZlAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADcxMjRFNUU3 QkREQjhFNDRCQzMxOUY0OTM3MDZDNDJCAEUHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHCwAVAAEA OQArAAQAcwEBIIADAA4AAADjBwsAFQABADkAKwAEAHMBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEEAAABbUEFUQ0ggVjJdIEJhc2VUb29sczpmaXggcmVncmVzc2lvbiBp c3N1ZSBmb3IgcGxhdGZvcm0gLm1hcCBmaWxlAN8WAQuAAQAhAAAANzEyNEU1RTdCRERCOEU0NEJD MzE5RjQ5MzcwNkM0MkIARQcBA5AGAJAVAAA5AAAAAgF/AAEAAABIAAAAPEZBRDBEN0UwQUUwRkE1 NEQ5ODdGNkU3MjQzNUNBRkQ1MEFGRTE4MkFAU0hTTVNYMTAxLmNjci5jb3JwLmludGVsLmNvbT4A CwAfDgEAAAACAQkQAQAAAEwFAABIBQAAqgkAAExaRnXCbWw+YQAKZmJpZAQAAGNjwHBnMTI1MgD+ A0PwdGV4dAH3AqQD4wIABGNoCsBzZXQwIO8HbQKDAFARTTIKgAa0AoCWfQqACMg7CWIxOQ7AvwnD FnIKMhZxAoAVYioJsHMJ8ASQYXQFsg5QA2Bzom8BgCBFeBHBbhgwXQZSdgSQF7YCEHIAwHR9CFBu GjEQIAXABaAbZGSaIANSIBAiF7JcdgiQ5HdrC4BkNR1TBPAHQA0XcDAKcRfyYmttawZzAZAAICBC TV9C4EVHSU59CvwB8QvxER+wWjpoAkBwczrALy9idWd6AxALYCQudAcwbm8FoWUuAQWwZy9zaG93 X0EiUS5jZ2k/DdA9QDIzNjNcbAuAZbMKgSUUVGgZ4CUSIBkwACBJTUFHRT0qZScAIAQAIG0EAQuA Z58nMAOgC1EAMBrxIC4AwG5wHHADECNgRgWxEDBhMm0LUGUsJQUn8U929G1mKLIsHMAl8AlwJzIL IxAmFygmpCApIHVrHcAbsWUA0GgmYgRhdcsecAQgaRAgbS4ldydB+SdBYSAJcAnBJ5ECICcxfnMK UC7WJQUrUCdBCrB0cy2xJ0FnbyeyGJAo8XgPK0EvczDBJQxDYzogpkwHcCeyR2Er8DwlEGk1ci5n NdBAC4AQIGwLJEADcD40qUJvYiBWRgnwJ9A8BuBiJEAuTmY4YTa/FMBpZxhQZEItGTBmLWJ5NTBa mS9ganUpQAORPHo7cs54OQAAcDlfCi090CUFJR+wYRIAVG8G8HMvglMIYWNlL1B5K1AXAiAiQQMQ ZD/0LnB5wCB8IDggK0ExPdFdPfcxKPMb0BmjZCswNA8n4RIAACAwYXMoKynPQxIBAB5wQ6QtKSUM DeCdASAgPdAkYAVAYS8+j/s/n0CjYkbPR99AkyoXAQABM3BiY2Q4MzJjQQ6wNS4uMDcAQGYwMjFi NRxgHpE3Nf8d4D13Rq9KT0tcQTFJP1AfCUtcQEBGQDIyNjdcLDZBIFVzHpAgVTFjiwtgBBFCQBIo KTo+BmtX/hIAbCrgQwlwGIBlhEFzVwJ0SW5mV1BfV49a5QaQNbAJAGIHQERTGIAiwGdCC4BDLaFl GkQHkHRXf1hPVXBkv1mBVwNdE1pXUiBebSNg7/9h9jWwEhAF0C4jNUEfYGJ/L2H/Xm1kVGTCICzw XHsZAMAuR0AQQKB1cHD/BJBXUSdgL9Aa4WoCJ/FZA/9XA2RUDgAgQF3PWKlrOmixjFtdbB9Ymk1h a1KQbwdxQSAs8DzBKANgLTEo/igi4AeAItEHgFdQRkAF0O9w0RtBIuAKUClzwG7/Zh2ZVTQ4NVYy VeE4OVWx31Z/c/90j3hfWx8oBxAtsaI9LPAnSUFM0CcmYMMFwHyXQVJNJy0QAHCDHGBZA0xvYWRG M2BIQWRkMCIgISzwMNx4RoB9fp9/pj6AMh6Rj4NkeD+E74UhRWRrfzByZxgwci4EkANgacAiFUAD IiswUH5AQU1FEFRFUl8gIFZBTARJRCswIkZJWF8ATE9BRF9UT1CCX4gATU9SWV+JYDBEUkVTBfAe UG4n/QVAYhngEgEzEgtgI5AbsWcrUAORKWJxdQdAMxI0/kdqMytRKBMocgPwK1AmkL99MX1zflAv wHyiLhUiRRb/TvCQ72ZokN9jv2TJkq+R7/9nH2gvaTtqH2svPiSD/5Yf851fk5ZSZVxQEgAuBTMS f42zCXA5EIbgHFEHgARgcn9A0H9Qf8SLIBrhGeCUEG4cRmQOAD12nPYyLjG6NKWALgPwHcAj4HOl gAclDBVCp5AfAEIAAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6 AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMA TQBUAFAAAAAAAAIBQQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABa AGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAfAAJdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBv AG0AAAAAAB8A5V8BAAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUA bAAuAGMAbwBtAAAAAAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAA ACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAA CgAAAFMATQBUAFAAAAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBu ACwAIABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQA ZQBsAC4AYwBvAG0AAAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAAAB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAA KgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAK AAAAUwBNAFQAUAAAAAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4A LAAgAFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABl AGwALgBjAG8AbQAAAB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwA LgBjAG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8J BAAACwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAAAHEk5ee9245EvDGfSTcGxCsDABcAAQAAAEAA OQCAhfUPD6DVAUAACDCKP24QD6DVAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBl AHAAdABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAACCAAAA WwBQAEEAVABDAEgAIABWADIAXQAgAEIAYQBzAGUAVABvAG8AbABzADoAZgBpAHgAIAByAGUAZwBy AGUAcwBzAGkAbwBuACAAaQBzAHMAdQBlACAAZgBvAHIAIABwAGwAYQB0AGYAbwByAG0AIAAuAG0A YQBwACAAZgBpAGwAZQAAAAAAHwA9AAEAAAACAAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdWg DwqWVsACakGySBmsVVoma+CTdwAAHwBwAAEAAACCAAAAWwBQAEEAVABDAEgAIABWADIAXQAgAEIA YQBzAGUAVABvAG8AbABzADoAZgBpAHgAIAByAGUAZwByAGUAcwBzAGkAbwBuACAAaQBzAHMAdQBl ACAAZgBvAHIAIABwAGwAYQB0AGYAbwByAG0AIAAuAG0AYQBwACAAZgBpAGwAZQAAAAAAHwA1EAEA AACQAAAAPABGAEEARAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0 ADMANQBDAEEARgBEADUAMABBAEYARQAxADgAMgBBAEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMA cgAuAGMAbwByAHAALgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwJ95rEA+g1QEC AQsAAQAAABAAAABxJOXnvduORLwxn0k3BsQrAwAmAAAAAAACAUcAAQAAADMAAABjPVVTO2E9TUNJ O3A9SW50ZWw7bD1TSFNNU1gxMDEtMTkxMTIxMDE1NzQzWi0xOTgzOQAAAgEQMAEAAABGAAAAAAAA ACZ3vTk77DhJpKYVPcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60ea TGQAAAlUwDgAAAAAHwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABA AACACCAGAAAAAADAAAAAAAAARgAAAAC/hQAAQHRMDw+g1QELAACACCAGAAAAAADAAAAAAAAARgAA AACChQAAAAAAAAIBAIAIIAYAAAAAAMAAAAAAAABGAAAAAECFAAABAAAAggEAAAMBAQAAAEEAAAAI AAAAAAARAEMAVABQAEMAbABhAHMAcwBpAGYAaQBjAGEAdABpAG8AbgARQ1RQQ2xhc3NpZmljYXRp b24AAAAAAAAAACMAAAARQwBUAFAAQwBsAGEAcwBzAGkAZgBpAGMAYQB0AGkAbwBuAAAAAABBAAAA CAAAAAAAFgBUAGkAdAB1AHMAQwBUAFAAQwBsAGEAcwBzAGkAZgBpAGMAYQB0AGkAbwBuABZUaXR1 c0NUUENsYXNzaWZpY2F0aW9uAAAAAAAAAAAtAAAAFlQAaQB0AHUAcwBDAFQAUABDAGwAYQBzAHMA aQBmAGkAYwBhAHQAaQBvAG4AAAAAAEEAAAAIAAAAAAATAFgALQBUAEkAVABVAFMALQBNAGUAdABh AGQAYQB0AGEALQA0ADAAE1gtVElUVVMtTWV0YWRhdGEtNDAAAAAAAAAAACcAAAATWAAtAFQASQBU AFUAUwAtAE0AZQB0AGEAZABhAHQAYQAtADQAMAAAAAAAAAADAACACCAGAAAAAADAAAAAAAAARgAA AADrhQAACQQAAB8AAIApAwIAAAAAAMAAAAAAAABGAQAAACQAAABDAFQAUABDAGwAYQBzAHMAaQBm AGkAYwBhAHQAaQBvAG4AAAABAAAADgAAAEMAVABQAF8ATgBUAAAAAAAfAACAhgMCAAAAAADAAAAA AAAARgEAAAAoAAAAeAAtAGMAdABwAGMAbABhAHMAcwBpAGYAaQBjAGEAdABpAG8AbgAAAAEAAAAO AAAAQwBUAFAAXwBOAFQAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACgAAAB4AC0AdABpAHQA dQBzAC0AbQBlAHQAYQBkAGEAdABhAC0ANAAwAAAAAQAAAFoDAABlAHkASgBEAFkAWABSAGwAWgAy ADkAeQBlAFUAeABoAFkAbQBWAHMAYwB5AEkANgBJAGkASQBzAEkAawAxAGwAZABHAEYAawBZAFgA UgBoAEkAagBwADcASQBtADUAegBJAGoAbwBpAGEASABSADAAYwBEAHAAYwBMADEAdwB2AGQAMwBk ADMATABuAFIAcABkAEgAVgB6AEwAbQBOAHYAYgBWAHcAdgBiAG4ATgBjAEwAMABsAHUAZABHAFYA cwBNAHkASQBzAEkAbQBsAGsASQBqAG8AaQBNAFcASQB4AFoAagBFADIATgBqAEkAdABNAG0AVQA1 AE0AeQAwADAAWgBtAFkANABMAFcARQB4AE8AVABjAHQAWQBqAGMAMwBNAEcAWgBtAFoAVwBVAHcA WQB6AGsANABJAGkAdwBpAGMASABKAHYAYwBIAE0AaQBPAGwAdAA3AEkAbQA0AGkATwBpAEoARABW AEYAQgBEAGIARwBGAHoAYwAyAGwAbQBhAFcATgBoAGQARwBsAHYAYgBpAEkAcwBJAG4AWgBoAGIA SABNAGkATwBsAHQANwBJAG4AWgBoAGIASABWAGwASQBqAG8AaQBRADEAUgBRAFgAMAA1AFUASQBu ADEAZABmAFYAMQA5AEwAQwBKAFQAZABXAEoAcQBaAFcATgAwAFQARwBGAGkAWgBXAHgAegBJAGoA cABiAFgAUwB3AGkAVgBFADEARABWAG0AVgB5AGMAMgBsAHYAYgBpAEkANgBJAGoARQAzAEwAagBF AHcATABqAEUANABNAEQAUQB1AE4ARABrAGkATABDAEoAVQBjAG4AVgB6AGQARwBWAGsAVABHAEYA aQBaAFcAeABJAFkAWABOAG8ASQBqAG8AaQBTADIAWgBMAGEAVwBWADAAYgBuAEYAWQBSADIAMQBZ AGMAVgB3AHYAUgAwAHgAUgBSADAAcwA1AGQARABsAFcATwBIAFIAdABaAEgATgBwAGMARgBWAFAA VwBVAFIAUwBVAEcAeABhAFMAVABOAGMATAAyAHAAWQBSAFQAVgBVAFcARwBoAHEAYQBVAFkAMQBk AGsAWgB2AFMAVABrADUAZQBsAFYATgBXAGoARgAwAEkAbgAwAD0AAAAAAB8AAICGAwIAAAAAAMAA AAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQAAAABAAAAGgAAAGQAbABwAGUALQB3 AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABsAHAALQB2AGUA cgBzAGkAbwBuAAAAAQAAABIAAAAxADEALgAyAC4AMAAuADYAAAAAAB8AAICGAwIAAAAAAMAAAAAA AABGAQAAABoAAABkAGwAcAAtAHIAZQBhAGMAdABpAG8AbgAAAAAAAQAAABQAAABuAG8ALQBhAGMA dABpAG8AbgAAAAIBAIAIIAYAAAAAAMAAAAAAAABGAQAAADYAAABJAG4AVAByAGEAbgBzAGkAdABN AGUAcwBzAGEAZwBlAEMAbwByAHIAZQBsAGEAdABvAHIAAAAAAAEAAAAQAAAANUYZdVnuxUSsJAyb hO3M8gMADTT9PwAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIAAAAHgALQBtAHMALQBoAGEAcwAt AGEAdAB0AGEAYwBoAAAAAQAAAAIAAAAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIgAAAHgA LQBvAHIAaQBnAGkAbgBhAHQAaQBuAGcALQBpAHAAAAAAAAEAAAAgAAAAWwAxADAALgAyADMAOQAu ADEAMgA3AC4ANAAwAF0AAACmUg== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFE182ASHSMSX101ccrcor_--