From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.9278.1618382055653506187 for ; Tue, 13 Apr 2021 23:34:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=k0fs6vYx; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: bob.c.feng@intel.com) IronPort-SDR: HCaC2KRODXhYCXzj9Ti6sJqCKYaw/RS6IU9VLO+ISTtah/zKqsUcsnMPhOsEG/x0kXvpsjVRXU fjWaWON2ctWw== X-IronPort-AV: E=McAfee;i="6200,9189,9953"; a="182086086" X-IronPort-AV: E=Sophos;i="5.82,221,1613462400"; d="scan'208";a="182086086" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Apr 2021 23:34:13 -0700 IronPort-SDR: a+uSC8fEOuebHZ7yBlGfBI76kGLbk9TZG3zvdPkXQLMjUleK0MU2/xaZVIUnCvAqgQ2rWsPxXo gng4dpmxqiNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,221,1613462400"; d="scan'208";a="615189746" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by fmsmga005.fm.intel.com with ESMTP; 13 Apr 2021 23:34:13 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 13 Apr 2021 23:34:13 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Tue, 13 Apr 2021 23:34:13 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.104) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Tue, 13 Apr 2021 23:34:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cczjFCUIbT2mLP5yI4FiXeCD/wU4TZKjfBJ+HasUUkEZDbgme3TMPKwaeQmttjJUDE5QsEziVyVV+rnq90hrE50Fo+7FFrxNLBqNpuY8Glaqan7y00slPXokkq6svb0Ea2vHb8gFczBLQoSP1ks3Oe+LisRGDUvOUCG4GisAnzytPvzwwpdqLkshOoFAksxB1cPlZ3nCcb8V/ts8tQ3uUiaEBfOaNJo1ZGwLAeYmhoTAPQcTxC/3lqm8Q+oMi9C2BODZXnzAgDstrvDfXK5hj2DM559sWc8q4C3GAmAVo4FP3kUGDcP24Ph86+6JX1bIuU+rygRi19tFDoyHEAK6SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wxK3utBo0YbPxfjxgRH/AxbVAobFH0elFGihBWNZddo=; b=ZxatcvpNzZTnXaqCnzVqZkysTOBm36gYx4cDnLHonMw4f/hWJKR1ZmuWvUFKYtoW/sAqPN6W43dPvy/S89gpJ56Xgr1+nC6JJoojw5O29LRkxuadWfaJ7RMsoKn2QcEbOBsABiI10hK2d8afLuzeZzh0OIoCrOaXafJgBcyBZK9QK/WVAAMbYFeBsWgTAdp6H9abIN315Rs1HOJky7qkG5MRzZnY2mkF9oC9L94SNzwBd5JJFz6gocMguupr476iG7JEllnnugO4QuibAneCX1ETP3o9F5IquCdoYHfYbNxhKMW7phJ7JsZLbSZJE+5yLibMH/r/VnRSww/Db4/sYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wxK3utBo0YbPxfjxgRH/AxbVAobFH0elFGihBWNZddo=; b=k0fs6vYxvAfRqjfMc6HlX1KDEq7JM6fFtWv40owRZk0iFcwiBT5Sar4aflN8cGTM1ozrdlMxbwreDUWOPd2MoqZW36JXVncdxI8Vo58fZQ1vaORFLd9yJLAemIv2Cgm+5Rb7eXMZA+gLHpYeuyd/fjq1HgITnGHsbmDN3yoP/bU= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB2857.namprd11.prod.outlook.com (2603:10b6:5:cb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Wed, 14 Apr 2021 06:34:11 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::cc64:a87c:5cf:5f18]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::cc64:a87c:5cf:5f18%3]) with mapi id 15.20.4042.016; Wed, 14 Apr 2021 06:34:11 +0000 From: "Bob Feng" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: Liming Gao , "Chen, Christine" , Andrew Fish , Abner Chang Subject: Re: [Patch v2 4/4] BaseTools/Source/Python: Remove CPU architecture assumptions Thread-Topic: [Patch v2 4/4] BaseTools/Source/Python: Remove CPU architecture assumptions Thread-Index: AQHXMN42qX+f8DqIdESkx4ryrIUZeaqzjpAA Date: Wed, 14 Apr 2021 06:34:11 +0000 Message-ID: References: <20210414032758.1818-1-michael.d.kinney@intel.com> <20210414032758.1818-5-michael.d.kinney@intel.com> In-Reply-To: <20210414032758.1818-5-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.5.1.3 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.197] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: da02a732-b975-4bfd-4c5d-08d8ff0f50bb x-ms-traffictypediagnostic: DM6PR11MB2857: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4303; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LADC5uAMf+56GzOwt+mObslUlD4sbRv8JmzMD66P4dc7cTUVvmgD5Zgp4wveJ2yy3kvGYA0l+lVEuXQqgmtRsvGecJYDacwQyeUN41XmW36D/JQ7qRJ6ykYH0GTCBA+bK6LmdUqsy2vO1lMBdSbcVkiS4YxZcs8VyvVpoGwxkEdtHhzq+/mwpwIfzmgxbiYNJ3d+LQOtoG3100VI5ndP6lpP5FBWIspoLu+j9lM9EhxXUYegWmdK7Fcakt89bZkQp3swGwXvXImNJY6EHAuCCFFn5lHi3PqErwvBEEECQd+/1LXIMX9gu0xXao3wjatx3aOuDo5F6guix3659d5VOFZPmRYJrXTMZuVn+RH9Daz84ccedtFNFFiEUgoefaXlhAfRU3z++c4KO6R6eK4LczcZmlqndjTmYI31CRnE0h96fZtM5O/ewJsooFeNvXaV1WS4J6/vjSk3Xnu+FH2SkGkwbKLCEtzaQtLtH/VprqdEqBsZWMip7b4yxUCqg7gwE3Nw0ZAYTBrfdRLqyvk7TKxa+1qnCCXG4IzeEtrEvPQM+imhq+ymlbDqv4eB46IrAX4HXJCiZw/61ZQNMGuKZuzLWKB82aXxmRLFsAaDIhmFocJsvMMPEW8v9RejGqND1CB/EF2m58SEneypuqAHpUzAMoI/+6cod+dZl1wkBZfyONSKsqfNGSqgISRK1uiOG3mXux2zV+c7v2Nqbnxqu7Ozeoa9smtERstJDWMrBps= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(366004)(376002)(346002)(136003)(39860400002)(9686003)(55016002)(5660300002)(64756008)(66446008)(7696005)(8676002)(26005)(54906003)(8936002)(66476007)(66556008)(122000001)(52536014)(83380400001)(38100700002)(2906002)(4326008)(76116006)(478600001)(53546011)(6506007)(316002)(110136005)(966005)(33656002)(71200400001)(66946007)(86362001)(186003)(460985005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?qCXhFBDvIzyM8yobqiPx1EEjqkO5m3EEPjLhyKRgJYyEK8lEiEWTWfuKM4RZ?= =?us-ascii?Q?MsfwXbQYS0HipI3HsddRojlVXyz+fdka9NNQJ7a/JlbM7cCVcNuVn8A+W4QL?= =?us-ascii?Q?nlYkUXki74t2HA17FImteib+fe3x1eSLpmlHG4R8gom11F0CaxiExKf4UwEC?= =?us-ascii?Q?8XkSrN2Emb+myWjrYi8IwaczOzUbNvZmBIterFynhW/eQ3SjM3deoF4am3hQ?= =?us-ascii?Q?ko0nL6CfyC4wv+AnIWjmvy1+ojBIrsyvcC0s3cOve4j9PgbBgXT2MZY+UgRZ?= =?us-ascii?Q?T1NGQ7+td8YAhzh/okCux5j4CXNW8WUQsztuyPURCVIoEqrzvZoSExMO7Kzv?= =?us-ascii?Q?xrJOpNV0IptfAe0KykV5pjITJv7o7yX4dmq/kn8lPzvU4dTWdz5VkYQh3tYC?= =?us-ascii?Q?ogOduiHFBbGHs9/oUUQ6Q9q7HbqbMGPjNX7HTQaLlWA90eWcBevQR4r3dKpj?= =?us-ascii?Q?SCXf/RsQJ8dZS7HDwscxmqzyJTLophNqKN+zDnmZO9uSM/cu0fRfxMZ82jWH?= =?us-ascii?Q?AEr9bZkL6ZuVE7ok1rBUSbf8VkeoXG2FNwdXKAr747377KzOy1xqOszTNEHO?= =?us-ascii?Q?ZHfDnbmS3F6aYhJywiv+ftoUkZFBunykhFANSyA2Kh3EVgR0cMj6vRrinzp+?= =?us-ascii?Q?PqFmC297LBQy80tAhZZ0rS4cxkHmscHqscqRh3OZEQi8utXoJH2gBKhaF6zV?= =?us-ascii?Q?Vb6Bx5PeX6iPkwIlDBIk+0Tf7PiF0s0MVxqkr39tG6IFw0tSDjXlzXbIzBAP?= =?us-ascii?Q?SCW9VOnHXx4MnAad13FoVLL82fhtmPgOBJIjoYs7AncvvmfLw8WdXnd3xkdG?= =?us-ascii?Q?GZBYqQf2wv0wekMgRG4fM88VisgdyEwZ8TqqV/MIXzue/fuSbr2m/SgDqhnU?= =?us-ascii?Q?rrtT4peWf/iNKHcqIOdjb33zXBDfSxXr6ET2cVu9Ytio2CyV+wLtSGmjLrki?= =?us-ascii?Q?4rtY1sPezzxO1BSXW3yprI6wjUg1z7JdfNSqYNz+hBI1QNPEgFb8mlPOz9OJ?= =?us-ascii?Q?5yQBogzanEnCXwp/N+ZQgdcn6tNVcTL3tHTcsQJtYEzaRh1MJcrBef2V26d5?= =?us-ascii?Q?4mRIzSAkItYAsNHRrrnWMTBbBnglEQA8Ikqhw0qFPugdV0Nfes/T3QqhvNHc?= =?us-ascii?Q?rdnLm3HRwb6cENVjPHLpj5AyxdEMWGG2p+qLVlMpTkFCB+405Q0kvSyv9zDT?= =?us-ascii?Q?Z/BNEhGpajm5rOfEK48Hg7385rptIoalg3Y3OC0y2xoPGD4K6Wg4T2iQBlVR?= =?us-ascii?Q?4NuvutIDd6gK2J0pHlcBpEp9kfXFr3nBLbQpBqvYpf63zDbJQn/Afe+9UeIS?= =?us-ascii?Q?mxrx0R3Bkr0kMarzSnTzo9I4?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: da02a732-b975-4bfd-4c5d-08d8ff0f50bb X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Apr 2021 06:34:11.6449 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: sVdN2GebWz/Kjhx2pod3es5dwRiyv3q0RWaOwWXBqcjWcftWWq19AlA3/qsdc26NZIfExNr/SNVZAtcbZV/6xQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2857 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: 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: Kinney, Michael D =20 Sent: Wednesday, April 14, 2021 11:28 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao ; Chen, Christine ; Andrew Fish ; = Abner Chang Subject: [Patch v2 4/4] BaseTools/Source/Python: Remove CPU architecture as= sumptions REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3308 The EDK II Build Specifications do not restrict the set of CPU architecture= s that can be supported. Remove places in the EDK II that assume a fixed s= et of CPU architectures. Remove build breaks in the following tools when a check against a fixed set= of CPU architectures is made. * Build * GenFds * TargetTool Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Andrew Fish Cc: Abner Chang Signed-off-by: Michael D Kinney --- BaseTools/Source/Python/GenFds/FdfParser.py | 4 +--- BaseTools/Source/Python/TargetTool/TargetTool.py | 4 ++-- BaseTools/Source/Python/build/buildoptions.py | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index ea2401b0e4fc..5c8263f9bcc9 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -1,7 +1,7 @@ ## @file # parse FDF file # -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2021, Intel Corporation. All rights=20 +reserved.
# Copyright (c) 2015, Hewlett Packard Enterprise Development, L.P.
#= # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -3504,8 +3504,6 @@ cla= ss FdfParser: raise Warning.Expected("'.'", self.FileName, self.CurrentLineN= umber) =20 Arch =3D self._SkippedChars.rstrip(TAB_SPLIT) - if Arch.upper() not in ARCH_SET_FULL: - raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.= CurrentLineNumber) =20 ModuleType =3D self._GetModuleType() =20 diff --git a/BaseTools/Source/Python/TargetTool/TargetTool.py b/BaseTools/S= ource/Python/TargetTool/TargetTool.py index 8e0ca387c356..71222e3cc899 100644 --- a/BaseTools/Source/Python/TargetTool/TargetTool.py +++ b/BaseTools/Source/Python/TargetTool/TargetTool.py @@ -1,7 +1,7 @@ ## @file # Target Tool Parser # -# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2021, Intel Corporation. All rights=20 +reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -197,7 +197,7 @@ def= RangeCheckCallback(option, opt_str, value, parser): =20 def MyOptionParser(): parser =3D OptionParser(version=3D__version__, prog=3D"TargetTool.exe"= , usage=3D__usage__, description=3D__copyright__) - parser.add_option("-a", "--arch", action=3D"append", type=3D"choice", = choices=3D['IA32', 'X64', 'EBC', 'ARM', 'AARCH64', '0'], dest=3D"TARGET_ARC= H", + parser.add_option("-a", "--arch", action=3D"append",=20 + dest=3D"TARGET_ARCH", help=3D"ARCHS is one of list: IA32, X64, ARM, AARCH64 or EBC, whic= h replaces target.txt's TARGET_ARCH definition. To specify more archs, plea= se repeat this option. 0 will clear this setting in target.txt and can't co= mbine with other value.") parser.add_option("-p", "--platform", action=3D"callback", type=3D"str= ing", dest=3D"DSCFILE", callback=3DSingleCheckCallback, help=3D"Specify a DSC file, which replace target.txt's ACTIVE_PLAT= FORM definition. 0 will clear this setting in target.txt and can't combine = with other value.") diff --git a/BaseTools/Source/Python/build/buildoptions= .py b/BaseTools/Source/Python/build/buildoptions.py index 094af4e2a8dd..39d92cff209d 100644 --- a/BaseTools/Source/Python/build/buildoptions.py +++ b/BaseTools/Source/Python/build/buildoptions.py @@ -2,7 +2,7 @@ # build a platform or a module # # Copyright (c) 2014, Hewlett-Packard Development Company, L.P.
-# C= opyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2021, Intel Corporation. All rights=20 +reserved.
# Copyright (c) 2018 - 2020, Hewlett Packard Enterprise Development, L.P.=
# # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -40,7 +40,7 @@ = class MyOptionParser(): =20 def GetOption(self): Parser =3D OptionParser(description=3D__copyright__, version=3D__v= ersion__, prog=3D"build.exe", usage=3D"%prog [options] [all|fds|genc|genmak= e|clean|cleanall|cleanlib|modules|libraries|run]") - Parser.add_option("-a", "--arch", action=3D"append", type=3D"choic= e", choices=3D['IA32', 'X64', 'EBC', 'ARM', 'AARCH64', 'RISCV64'], dest=3D"= TargetArch", + Parser.add_option("-a", "--arch", action=3D"append",=20 + dest=3D"TargetArch", help=3D"ARCHS is one of list: IA32, X64, ARM, AARCH64, RISCV64= or EBC, which overrides target.txt's TARGET_ARCH definition. To specify mo= re archs, please repeat this option.") Parser.add_option("-p", "--platform", action=3D"callback", type=3D= "string", dest=3D"PlatformFile", callback=3DSingleCheckCallback, help=3D"Build the platform specified by the DSC file name argu= ment, overriding target.txt's ACTIVE_PLATFORM definition.") -- 2.31.1.windows.1