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.web09.2902.1651524845496983874 for ; Mon, 02 May 2022 13:54:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=TQDT2luS; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: nathaniel.l.desimone@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651524845; x=1683060845; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=kRhe8w2457QmPsFoogaKSSHTqoYZKpqPdKLhWMgV6ek=; b=TQDT2luSrcZnUvS/P39xssocb8psudFwxWEHIiMa75FkVzt86p1Z+Uwf MvT7H1zh+sO/miZrKh3m9E1InMK9sntZx1Bw/qXrakgol9CMJ3DRfdZnW zLrBtB8eo1U5m11wZnImQXGmcMQvA8dsdFQkX1oQIPCHqDYMfCp1nD9hT qSIoB7nYb5ovM+zpTJygO7xo5wF2njNjyj7JovgJvOeidlD5aSbnEIbIB 1MoH8HGzMo0DDGafV7BA5VJftxw37Zfb9K/Mvt7YbZgCv+UzpvKANLNXo G1lnMtH2v5+DN54iITFHKwbM5QT06qBbstQEJf5sD47H2PTEE7+7ght+B A==; X-IronPort-AV: E=McAfee;i="6400,9594,10335"; a="247234777" X-IronPort-AV: E=Sophos;i="5.91,193,1647327600"; d="scan'208";a="247234777" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 May 2022 13:54:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,193,1647327600"; d="scan'208";a="546617627" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga002.jf.intel.com with ESMTP; 02 May 2022 13:54:04 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Mon, 2 May 2022 13:54:04 -0700 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Mon, 2 May 2022 13:54:03 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Mon, 2 May 2022 13:54:03 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.108) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Mon, 2 May 2022 13:54:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TvjBrpBhI3qTQpz3g+nzLuAan+e1m0Vb7UyK+f4CGMbHfKONjaBBEP7bMMGfzHYKOYj92j7YNlJ1+FvQ2jLDbvp1xm27Ol+Q3VSwyq4WlY4VwP5yiiRj8n2kssF+N9tUBieVKFVCGoS05pVgK8PzgJwNgyS8OmcQHvOT8anDruSY+vC0vDJa1UgGXWHetUE4H+5YQgRQY6kkAqcjs4En6DmgYX2czYsWbvQy4HLe55EIcOixzcKnck8JhG/ceZnkyYH1c74uyjLSryPd+oPupCaED0Z/lQJJ4bkJl/yFVhSPlPZjdwEfHAzsbb1XoyHnd/tTMNvDYmldHyoYr65kLw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tZn18p/rKG2j+fvBPHmPtBl/iKqLVV9DkuxkHEidG2A=; b=g1UpVb1Bj3Z5Ukddfjz1T+aOxNQrfbXB6S9gqwBkRZ2QSqzjHii5uR+s4w5T7zjX5Xm/nVrlmjUCHSU5qKQKrmUlGcR5do0Gs8hHTIQZyyI0yD9mEj/1k3M+PLo/NpT5mLGI+SLLYvkD716Obl7/w7P1CzdXDEvhW3I/8t7JHijdmRCBn73iMqpnCmITK9fOOrKJIOrwSHFyDi36AEIe62C2H6vR4nDHgSb5G9Sbtx7CVoDBDk1BTRDx5bG9ej1fsApiyacsPFNafgAzbsMElN5rAn4/mTS5NvQ5Ci7OtxEd2WkSAVgHqYapNK1oUsRo3jUy5BaExwUmM0qjqBrgMw== 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 Received: from MW4PR11MB5821.namprd11.prod.outlook.com (2603:10b6:303:184::5) by CH2PR11MB4389.namprd11.prod.outlook.com (2603:10b6:610:3f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Mon, 2 May 2022 20:54:01 +0000 Received: from MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::c410:b7f7:beac:3e2]) by MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::c410:b7f7:beac:3e2%5]) with mapi id 15.20.5206.013; Mon, 2 May 2022 20:54:01 +0000 From: "Nate DeSimone" To: "Oram, Isaac W" , "devel@edk2.groups.io" CC: "Chiu, Chasel" Subject: Re: [PATCH 1/1] WhitleyOpenBoardPkg/Build: Fix GCC build issues Thread-Topic: [PATCH 1/1] WhitleyOpenBoardPkg/Build: Fix GCC build issues Thread-Index: AQHYXArxTBIgK8Ppc0GJbpTZJxuX7K0MFU5A Date: Mon, 2 May 2022 20:54:01 +0000 Message-ID: References: <20220429205124.1530-1-isaac.w.oram@intel.com> In-Reply-To: <20220429205124.1530-1-isaac.w.oram@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d94e7b59-2212-42ab-ddc1-08da2c7de2df x-ms-traffictypediagnostic: CH2PR11MB4389:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: N2jFLuqjHk/E4dqPDEreEEa9mbbkogajjOY7w/6HnC3hvq2o4fYboGNqa4jsEh1WrTW5mulP3+rKCvOqGeoL8RWW1Xs8mHDOc5Kb1MlszK9QBBdNk+/tB7RJmiHLCdH/afPI3aemP8x2s16fLmx+hcSh3RGzkc7NpIlsHC7cWu7xL8Yn1J0PUo0AJEimBGkBqa2pzUHzuF1eGZMemnXN+z3hb3Oa8d0lWu85jZWa702lqOUIUCqGLubUJqBW/QqOImpY8vs4UCe7uoGWo/DOM9QAXhHIItqb++LfqC0W82F/pV74RZV88UQ4QR/3DUGQ1BgatAQvPjEJ75m1Gdc6Rof2R8sti1XFFGoDPaKTDTL1UDDLSsd1UozNlCan99X7ySF2I6C7kDnUyGuDnok7VBngq4CypxQUJa/XFvk7imKi9RFQpp0O7gWZOVipISWvGdtVyvt1whdsSLNXBpJK9gXuq6lDLPkgUCK8P4/CTts1/DKhnCZLAEVAD5hoffVjmL+U43zxS7fqiZ/+28X+upGKB1NbL+UirUmmTeNQVP20YIehO9xR0NOHqeYd8ZKJ3d+hY4kLHd5bBuW9pyla99hSIv2b3PmYUJrpPIKEFp7YHzbeeHVLzz5ZhpLR77AQX9ukqjZkva3cTV7UhI7rVbNYG4UsLppSjzP42IoTmq0Tle6Sry/VbFNZxxUn1Pe4F7AitC9TUWBVNh4RmHryWQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW4PR11MB5821.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(110136005)(508600001)(107886003)(55016003)(9686003)(6506007)(53546011)(7696005)(83380400001)(186003)(26005)(86362001)(66476007)(66446008)(66556008)(66946007)(64756008)(52536014)(71200400001)(4326008)(8676002)(2906002)(5660300002)(33656002)(8936002)(76116006)(38100700002)(122000001)(38070700005)(82960400001)(316002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?r8Ki2vZgycNEKT+un6w34aJqoGBPsD+qtRLINwP+OyUXdWJ0GCvI+qgIScqu?= =?us-ascii?Q?SaAm+7vv7DFy+vUsCd/kijDf/N3r0hKCwMA313YB2sr7byUtaXq8NBXkC6JF?= =?us-ascii?Q?2xCJLS749UlSkv9F6uDh1Xf+e94ZDGWnlBo0JMqndigJrARvuDwk2guU2MFk?= =?us-ascii?Q?VnaglWEtPqtU9knZPu4aKkDipkwqUgM4O61vCoEiUNNFuQ83oIT7D8k6aaa6?= =?us-ascii?Q?WVG0wy9Ptvq+gF1zdnzlzFIFvyec6/9y2Nr8l6kwZowGx8s1uQbRgKGSnotl?= =?us-ascii?Q?WuOpI43KfkqL4u+W0IQ9RZzwsXyYmQiJLmxtScpo3fKpWXoKYJ8cUA68Eaxb?= =?us-ascii?Q?qP2eAwjEUQSr3yDxHC1jhHD7/ivdVgDg2vX/ZrYXM24HnKzqFsD7JXTgLQdS?= =?us-ascii?Q?Yp4VFOXBJkraj3aMp+uT4W0OdHapOHG73mn7K5goy0JZ8i7+a05owt21xAyc?= =?us-ascii?Q?6JZHawhHqjRFRn0ZW0ypDkWagkuBO/EyXmpQ+KcEBeBZjLgcro2Tp9JG/zMj?= =?us-ascii?Q?/LEZr1ld9Y434U4gKhTdKJJH2cJk5Lx8NPNv8TkG+NSic0SmnWLRjGhSdrcX?= =?us-ascii?Q?fdUytrZ9ttUPGrObEt7kt3f9oMC8XW5u+d2rhSYpaQqPMev8+12iZchheqqM?= =?us-ascii?Q?SqmquDWfKqyBmNJh2W7Z1lXE7MKpcWZRYSmJdqM5+Vrvj1rfbwJlxM09+4xE?= =?us-ascii?Q?0/xoyBcYOixTMAUK/p0JG16sQgVubAtWjHJxpOLjDGSL3WwZKyJYgOyrYAjU?= =?us-ascii?Q?O9jzkpaZK4FcULnfYvcL4EaXjp1psU7kNTfs4RV/8fud7bjgraUC3D/niO2U?= =?us-ascii?Q?gFJq56q6rZBisXWP0BEaDtduKC1fnokq0yB4yiG5H95U7MzszoYTsaDzwSMl?= =?us-ascii?Q?juFhyO3c+sJvUf5PysJAhcUdNw6LzL0Ba6GyJ839mmETkhugJMoAszEiBAGA?= =?us-ascii?Q?2tjGRoVLW4RRQp+ss588A7I7pbzRYqXMB28cGAHwMvKCx3xxVx9yfG8LkglZ?= =?us-ascii?Q?x92ZkpJooRDNN1NiTHSqpI+L7eUwiEDY7iwYvRun2vLsmgOWGUBYjB9a6eAu?= =?us-ascii?Q?SOngrbuJGHWug8L9DolrcFD4fKaLnCaUim1qSqf9sFgTg+BB3HEl9+4dJUoU?= =?us-ascii?Q?/9D10zJ8Lt52K02ViClP1RDqR8zmsDOy7ePGgKGkVRlAQuoO0+fugFPEVBro?= =?us-ascii?Q?iuiH3X5zmL0MNMfXzVBNmk/z/14Q8+bcTuprxdpfty/bTvi2TIOPYsJCbSxA?= =?us-ascii?Q?4wWYRVX9AmQhlXg2icIFITfSinK4DejNC1nVF6ZyMz7F3UOXd8iVi6Ecz4mU?= =?us-ascii?Q?fsimxRVe8sDWQl33SRqPQpg8T72cn6cdkiPIvSEyRuCJj81+92+rX62WNUMS?= =?us-ascii?Q?4l8BNEvYdawDjZNSdhzroP0HA1Vhbq5zGS2ruLXhetxryAdXozGMYgvTlo90?= =?us-ascii?Q?fO/uUkmsDnRnDFXl4E2DAzGFYil6K2CwqFxaOS/G1d42icWXQFAvnQhyL11R?= =?us-ascii?Q?MEM/JVQHQcdUbGMHVNlbT64Wcjf+7BOKisLHY5rvZxunS5l4apo8KYn9SYXZ?= =?us-ascii?Q?bnshVEhCIX3GpJqbXpw6cTLqBXm8WO208szQYGJulxHFz+PwmhtbnDgDxvce?= =?us-ascii?Q?UHlPSObF1GOn2xfEOB0mbUbvzt3KjeXOo8q6/H3U5tZHEJ6DEJx46cn0WABF?= =?us-ascii?Q?ANtrfW5bKEPjipyfrX+AIvb4gWHMZ3EM0cafVzq9xWH/LJnR27JxxfReDMQy?= =?us-ascii?Q?q5GJwrrIb42FOuCF3zeKpeTqjWqESMA=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB5821.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d94e7b59-2212-42ab-ddc1-08da2c7de2df X-MS-Exchange-CrossTenant-originalarrivaltime: 02 May 2022 20:54:01.5046 (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: KRFfzewJh+HmCj+ZnW26CXY98f3cv9PTR9u2x9MbML4OHckjoucJCo9kuZS4nAejequZWwuJ/9aywOr/+xNFPVzQJT+qKiquuEYdI66TWuI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR11MB4389 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Nate DeSimone -----Original Message----- From: Oram, Isaac W =20 Sent: Friday, April 29, 2022 1:51 PM To: devel@edk2.groups.io Cc: Desimone, Nathaniel L ; Chiu, Chasel Subject: [PATCH 1/1] WhitleyOpenBoardPkg/Build: Fix GCC build issues Fix build warning in PlatformInfo.c. Fix script invocation issues in build_board.py for AML content build in Wil= sonCityRvp and JunctionCity. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram --- .../WhitleyOpenBoardPkg/JunctionCity/build_board.py | 11 ++++++++--- .../Platform/Pei/PlatformInfo/PlatformInfo.c | 4 ++-- .../WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py | 11 ++++++++--- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py= b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py index 72d0c5089a..ccf7a8c55a 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py @@ -62,7 +62,8 @@ def pre_build_ex(config, functions): =20 execute_script =3D functions.get("execute_script") =20 - command =3D ["build", "-D", "MAX_SOCKET=3D" + config["MAX_SOCKET"]] + # AML offset arch is X64, not sure if it matters. + command =3D ["build", "-a", "X64", "-t", config["TOOL_CHAIN_TAG"],=20 + "-D", "MAX_SOCKET=3D" + config["MAX_SOCKET"]] =20 if config["EXT_BUILD_FLAGS"] and config["EXT_BUILD_FLAGS"] !=3D "": ext_build_flags =3D config["EXT_BUILD_FLAGS"].split(" ") @@ -79,7 = +80,11 @@ def pre_build_ex(config, functions): command.append(os.path.join(config["WORKSPACE"], "PreBuildReport.txt")= ) command.append("--log=3D" + os.path.join(config["WORKSPACE"], "PreBuil= d.log")) =20 - _, _, _, code =3D execute_script(command, config) + shell =3D True + if os.name =3D=3D "posix": # linux + shell =3D False + + _, _, _, code =3D execute_script(command, config, shell=3Dshell) if code !=3D 0: print(" ".join(command)) print("Error re-generating PlatformOffset header files") @@ -109,7= +114,7 @@ def pre_build_ex(config, functions): os.path.join(config["BUILD_X64"], aml_offsets_split[0], aml= _offsets_split[1], aml_offsets_split[1], "OUTPUT", os.path.dirname(relative= _dsdt_file_path), dsdt_file_root_ext[0] + ".offset.h")] =20 # execute the command - _, _, _, code =3D execute_script(command, config) + _, _, _, code =3D execute_script(command, config, shell=3Dshell) if code !=3D 0: print(" ".join(command)) print("Error re-generating PlatformOffset header files") diff --gi= t a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformIn= fo.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/Platfor= mInfo.c index 0065819d83..439ce357f1 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/Platform= Info.c +++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/Platf +++ ormInfo.c @@ -413,8 +413,8 @@ PdrGetPlatformInfo ( return Status; } =20 - if ((PlatformInfoHob->BoardId >=3D TypePlatformMin) && (PlatformInfoHob-= >BoardId <=3D TypePlatformMax) || - (PlatformInfoHob->BoardId >=3D TypePlatformVendorMin) && (PlatformIn= foHob->BoardId <=3D TypePlatformVendorMax)) { + if (((PlatformInfoHob->BoardId >=3D TypePlatformMin) && (PlatformInfoHob= ->BoardId <=3D TypePlatformMax)) || + ((PlatformInfoHob->BoardId >=3D TypePlatformVendorMin) &&=20 + (PlatformInfoHob->BoardId <=3D TypePlatformVendorMax))) { // // Valid Platform Identified // diff --git a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.p= y b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py index 5f625f5f92..e2d32d3e13 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py +++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py @@ -60,7 +60,8 @@ def pre_build_ex(config, functions): =20 execute_script =3D functions.get("execute_script") =20 - command =3D ["build", "-D", "MAX_SOCKET=3D" + config["MAX_SOCKET"]] + # AML offset arch is X64, not sure if it matters. + command =3D ["build", "-a", "X64", "-t", config["TOOL_CHAIN_TAG"],=20 + "-D", "MAX_SOCKET=3D" + config["MAX_SOCKET"]] =20 if config["EXT_BUILD_FLAGS"] and config["EXT_BUILD_FLAGS"] !=3D "": ext_build_flags =3D config["EXT_BUILD_FLAGS"].split(" ") @@ -77,7 = +78,11 @@ def pre_build_ex(config, functions): command.append(os.path.join(config["WORKSPACE"], "PreBuildReport.txt")= ) command.append("--log=3D" + os.path.join(config["WORKSPACE"], "PreBuil= d.log")) =20 - _, _, _, code =3D execute_script(command, config) + shell =3D True + if os.name =3D=3D "posix": # linux + shell =3D False + + _, _, _, code =3D execute_script(command, config, shell=3Dshell) if code !=3D 0: print(" ".join(command)) print("Error re-generating PlatformOffset header files") @@ -107,7= +112,7 @@ def pre_build_ex(config, functions): os.path.join(config["BUILD_X64"], aml_offsets_split[0], aml= _offsets_split[1], aml_offsets_split[1], "OUTPUT", os.path.dirname(relative= _dsdt_file_path), dsdt_file_root_ext[0] + ".offset.h")] =20 # execute the command - _, _, _, code =3D execute_script(command, config) + _, _, _, code =3D execute_script(command, config, shell=3Dshell) if code !=3D 0: print(" ".join(command)) print("Error re-generating PlatformOffset header files") -- 2.27.0.windows.1