From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.21753.1644376878463703329 for ; Tue, 08 Feb 2022 19:21:18 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=bVuxgUWe; spf=pass (domain: intel.com, ip: 192.55.52.151, 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=1644376878; x=1675912878; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=EFLozWaBUsk5t3/uQmOVkSsuEZUtQrSoEVOwVvfUcDY=; b=bVuxgUWeUFzer6vKktW9MlfCZVqOK65Bk/B79MYWMb0UDW9IW2yNw4ge ZHj5A/3zuTm87sU134MkSBIjJKmrLG4mAJEaBDMy9LK5rR02RGMFwVeYG rr74eKAHW+jh9/QS1jWKgLjh2FVUHDJbjDxCm3cxGTWDdQRdvlKXGtxFr uPB2grmXIPkcnZ49Sv7btX+1dlibIx0b7As71Ffp5GhJVFIcmXISzf0wd /6Eedb6nrS6qHZb897ZVzygkH5Ejita/+nFwzcFrdRv0bwwIbBfKony1l t8/tv1EJaAXJGTZQ6xQZp2xxPgb6cOOCspwzHYC6rv39soxQsaXQaCce4 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10252"; a="229758740" X-IronPort-AV: E=Sophos;i="5.88,354,1635231600"; d="scan'208";a="229758740" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2022 19:21:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,354,1635231600"; d="scan'208";a="540903617" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga008.jf.intel.com with ESMTP; 08 Feb 2022 19:21:17 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) 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.20; Tue, 8 Feb 2022 19:21:17 -0800 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 8 Feb 2022 19:21:17 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Tue, 8 Feb 2022 19:21:17 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.170) 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.20; Tue, 8 Feb 2022 19:21:16 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jOTV+cENZkGOTsK4upa/IjXQynMwx+kP9hEtPpjQU3vvRnU51wsBRXin6Pg6gROzMfKbCzrX1LFvZAsEhPto0f50j/8RLyebP1IFei7WxXq5k2JzGgeRy/2UB72J1DyTqnDoi4JuKaf+gXiTwyQzpvTwqTWEsFQeTt96ljBzeblLQqm9/sEw1v4HuVesQQVKDJ7c+rTKL0YLBIFnPUZG9rY+gFhqWPizWkyZvat+mAqtZWag6C+GH6O7KOxWle22oCLHVCWKXS1Pmc/SbuMd5JyUBjLsOGmjTP1yyBFKx4Fdz2eBoINjgA8wk2/EndCUBIkc/w5pwoZiZ3AVVZ/IMQ== 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=61UJWslC9fNEhMFz11Da2DjxFWnMdTV3th1TSCHc+00=; b=HucpiCSetrvTF7vmlyEU/qpMN/4Arfq/qmSTFDH+iL7EVkhs50DKjNsiBf0KZ/7WTjNmNWyZbaxWGHn36Ezna59UJDg3lpwsaMR0XpNzS8jBVdMDUSQRlAUtIdsCULsC5nucrjBHjW1N9/B4FCg5ONCMC2UFdgXBFZ33jFiMcL8yPNV2olB2iXWx8l7qyWxQQbaSruJoaCg1qSWK4zjxiTm6Kga4P0VKsHy8iyUja6xCYftsUDqhZ/Or0+1TUCxORiC2W4cOQBCn0TNUOIXXwqwoK1vc4KMWYYIODY5pwC0nBzS9YmMGltGtT8IR6dezD3ISyggmhM8ybGQI9NhOOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MW4PR11MB5821.namprd11.prod.outlook.com (2603:10b6:303:184::5) by DM6PR11MB4547.namprd11.prod.outlook.com (2603:10b6:5:2a1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Wed, 9 Feb 2022 03:21:10 +0000 Received: from MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::6920:39b9:e18c:9dc5]) by MW4PR11MB5821.namprd11.prod.outlook.com ([fe80::6920:39b9:e18c:9dc5%7]) with mapi id 15.20.4930.022; Wed, 9 Feb 2022 03:21:10 +0000 From: "Nate DeSimone" To: "Oram, Isaac W" , "devel@edk2.groups.io" CC: "Chiu, Chasel" Subject: Re: [edk2-devel][edk2-platforms][PATCH V1 7/8] WhitleyOpenBoardPkg/WilsonCityRvp: Generate AML offset table Thread-Topic: [edk2-devel][edk2-platforms][PATCH V1 7/8] WhitleyOpenBoardPkg/WilsonCityRvp: Generate AML offset table Thread-Index: AQHYHFVVMPkX+KNTpEy5LZSK1SunaayKj33w Date: Wed, 9 Feb 2022 03:21:10 +0000 Message-ID: References: <987586e418eca8caa7afd342ec344bf0897b444d.1644259969.git.isaac.w.oram@intel.com> In-Reply-To: <987586e418eca8caa7afd342ec344bf0897b444d.1644259969.git.isaac.w.oram@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-reaction: no-action dlp-version: 11.6.200.16 dlp-product: dlpe-windows 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: beed3ca4-2375-4bfe-2302-08d9eb7b381d x-ms-traffictypediagnostic: DM6PR11MB4547:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4502; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xizo9UsF9FDPKFfR/uIgcAuqKgLC67DhEzQhIsITZngL7ms9f2P4AJF31frbwQDlKLsIUEV6C2qeqZuK1j04UcHpdo49yuiDPP16Yf0Fd9dXKWNVaSVug0q1uU1M8Bi+Lkc5Y/X6lBf9oy+GtDtjoTur6CNgQ4xlBo4tJ+Pt/ygfAvoyzqt+zIIpPc1wxB+g2/5R/CJlRDLQaQKi41loSNF2Nqxmsh+ERIgDaNhnBeoYomiGk5Yu0CBcFqqG5+1TAvnojO3dWiYOERs87pEpJuFfl6YEWjcGx0GKOT/T1uScjarjrmElACPBPjuoKwTi0WeInwEYfWhJEVWfvL7IL2df37UBJGuNibywMwVqUucXeT/0L6QslI9o2rPIJhPSYhwS+KAOoYNr7lwbnQrXCy69HR96+LpPAIFuR28XGO+b0/rMXq1/Nx5xxTYGycO0/gkRG+VDQdKsgyQYw9yvirbp4Ske0OnWQls3JWLPhS3ma4bBHtjPirXrnWPX7BYkzdmDF9169YW5QjyDy5+Thts/+B4hQeCwKmEt0GaEbyetvVTD+xYG3bNinS4wDW3zfuP80UdHOVUWExuXsuvGZ4cL6luiCsLcjwCB3xBIgaGtL9XsXxTxFNXoFkEYrGAP52RGka75skHdjDFFUcQFE/ppmYOL16mK7VAnIFJi8vlmUKE7ly+KWmi66Csxaa/zROtK9OJE9MK4gdReVzwpXg== 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)(76116006)(8936002)(66946007)(38100700002)(508600001)(66556008)(66476007)(8676002)(66446008)(38070700005)(4326008)(53546011)(83380400001)(5660300002)(52536014)(82960400001)(64756008)(2906002)(26005)(55016003)(110136005)(19627235002)(316002)(86362001)(71200400001)(186003)(7696005)(122000001)(107886003)(33656002)(9686003)(6506007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?TvetYxMSCFp6vHW5Rlb83TQUXm0oDlwoGLv5Iycu642vk5ulJoq/uVA2uZIv?= =?us-ascii?Q?uoERSrNaNQ0ZOphfE5cxaUcqxXH3/IDOcw6OFvFqgqQvBNUkjaCcMEouvKwX?= =?us-ascii?Q?0pcGZdcJYQDEUFXxKr5wM9BqKIzirhVF/UFUh6CRr2uE0Gh0NjsasRGW8TN2?= =?us-ascii?Q?FhvqG6mlgyeMMDRiwGVK7qv9ab4ybEAS6hw4TmXxGVmZ7h7b++pzeEDzIeKa?= =?us-ascii?Q?23yaydHyqu/oNETWhJnkeahx8T3LAvH6AIHZIVDq1iRXfugTMs5EEBAET1sG?= =?us-ascii?Q?W9TfYiJcbJ62Bud6afGUeA3/9vgkOECqDknCwnky9WESp7hl3IrVgNa/XiFA?= =?us-ascii?Q?BjYGdZ8dbK4RxB7NxotoFfQ2P9Rw5q5b/kjQ4Q1DCdvDEN16uTLXaZhes2Ns?= =?us-ascii?Q?kIQOI0cDwwi8IW7DJ6Cc6OzB1q97HyO9PxLebj7s1qq5YbmPsHNHO2iyTVnc?= =?us-ascii?Q?S0BKt5vhUSRLiiD9odCoc92JVMrxUX3yeAws54YZnsy8n1HCU7ibjk58ZGN8?= =?us-ascii?Q?o+TeSMohIY4XPCCwasrfn7YieumrzxbVRADU0QyXvcr2xIVJMmOMVoMaFVuX?= =?us-ascii?Q?Zhk5l8DjGd/eHK8FtDUewBU+lokjJ01ZndXr2f8fBIafx7s74hwUqbdCsM13?= =?us-ascii?Q?YFh3xa6VyNTFpoUZPtsqCqKNCuhFGlneUbTmGT/xZsCAKDxY4sdtRHQ4Ofbw?= =?us-ascii?Q?GwxpBaFhsaqhvXkeWi7tL4Ug5/88nDCiCO2L9wD60PflXTaBESJ9/87zCYq3?= =?us-ascii?Q?q6CsOUT2BZ14299LFdGhN1tf+PRyLe7j1zJ1MawfGzQ9ABn5jcBQ8o9uvUbu?= =?us-ascii?Q?wAeY9sd98hEdiXR0CAq4PUF2T9e/SEFx9h+BTw2EEgVecpWQpISNPLBn74Zh?= =?us-ascii?Q?ZN+Go/MpLnAF56OdtRNcGoUGsDSmQUAxy+0+efHadv4v2Bo5rKynFvMDd0zi?= =?us-ascii?Q?K+O9E2SGOtv6iIMS8X/WxaBc4qYB2Bqudp/DZp3qwsIuj0fottx1U/VuyNfY?= =?us-ascii?Q?YrsgXbpcks4XzTXJgqtfUjCLu34/Hk3LTzct1te3BtecGlOKHdUqzFBRLhTy?= =?us-ascii?Q?PGl1trrlyK5snQqMTYrw55HQx1+SYEHUj9aPMaoDHLfXRpYnPB+QuLmjWSsL?= =?us-ascii?Q?qqKwGr1yORkHr4b939/jMlZI7eFfrGRs7WFS2FTq+g+OUsEWQXqF1TAaSuKu?= =?us-ascii?Q?PphSqqbLVNWLnDkpg+xj1OKFXtX9nGVjXcZL22fRO+ZhlrFtwabPfVc83Wot?= =?us-ascii?Q?QJKqAS8r2Pxy2HHRdxgCC9GIniivk7PFkh2oK1ut3Vzf7SfOuNDIUTCZSoJF?= =?us-ascii?Q?kRAG4RGQQfLkeLvGHHXQXQNjoALQnYP3Y1WTgDiPkVb4Ca9Fvra/tI9HMW+a?= =?us-ascii?Q?QEUvk9Gfd4yItIWHlPsAa8riTYNVS9sfuHZmiN5AvB2LhUGNe1NHMPr6hE2W?= =?us-ascii?Q?1+jZzTfgP+m6i1/pj12bN0lcnQxmeuDjlecit6f2Y/afu1IYnM6CW8BZVs/A?= =?us-ascii?Q?Wg/7nnpddZWpHSjeFYsWJN5aQRnDqGSSwKU5NlqHNBuuz6BEK8aSuvcQxV1M?= =?us-ascii?Q?MTny4AgMJMww4aXeuSo7TGlyCUtxI1Q8jz/sZSiEioIoL8itDS9RiKJwWmqz?= =?us-ascii?Q?4PoRL2kkq36kV1QFklPZusjty+ylH+0xuii26H/tm5Zw6vVqdSOdwz3rK9eo?= =?us-ascii?Q?oPM5EQ=3D=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: beed3ca4-2375-4bfe-2302-08d9eb7b381d X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Feb 2022 03:21:10.3021 (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: 5JL6UHmFCBE64eHI/Nq7pFYXyaszUCBGeGrJUzSrRVhxv2nfv40gd+zNvB2b7kuXIW00gV5sloSlabt9pcVlrE2wysuGylPugI5G9GJR2IE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4547 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 > Sent: Monday, February 7, 2022 11:03 AM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Chiu, Chasel > > Subject: [edk2-devel][edk2-platforms][PATCH V1 7/8] > WhitleyOpenBoardPkg/WilsonCityRvp: Generate AML offset table >=20 > Add PreBuild step to generate the AML offset table for the ACPI tables. >=20 > Cc: Nate DeSimone > Cc: Chasel Chiu > Signed-off-by: Isaac Oram > --- > Platform/Intel/.gitignore = | 2 + > Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets.dsc = | > 41 +++++++++++++ >=20 > Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets/AmlOffset > s.inf | 26 ++++++++ > Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py = | > 63 ++++++++++++++++++++ > Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg = | > 15 +++++ > 5 files changed, 147 insertions(+) >=20 > diff --git a/Platform/Intel/.gitignore b/Platform/Intel/.gitignore new fi= le > mode 100644 index 0000000000..548fee5bea > --- /dev/null > +++ b/Platform/Intel/.gitignore > @@ -0,0 +1,2 @@ > +WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/AmlOffsetTable.c > +__init__.py > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets.dsc > b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets.dsc > new file mode 100644 > index 0000000000..2e5ebf432a > --- /dev/null > +++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets.dsc > @@ -0,0 +1,41 @@ > +## @file > +# Build file for generating AML offset table # # @copyright # Copyright > +(C) 2021 Intel Corporation. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent ## > + > +[Defines] > + PLATFORM_NAME =3D $(RP_PKG) > + PLATFORM_GUID =3D D7EAF54D-C9B9-4075-89F0-71943D= BCFA61 > + PLATFORM_VERSION =3D 0.1 > + DSC_SPECIFICATION =3D 0x00010005 > + OUTPUT_DIRECTORY =3D Build/$(RP_PKG) > + SUPPORTED_ARCHITECTURES =3D IA32|X64 > + BUILD_TARGETS =3D DEBUG|RELEASE > + PLATFORM_SI_PACKAGE =3D ClientOneSiliconPkg > + DEFINE PLATFORM_SI_BIN_PACKAGE =3D WhitleySiliconBinPkg > + PEI_ARCH =3D IA32 > + DXE_ARCH =3D X64 > + > +!if $(CPUTARGET) =3D=3D "CPX" > + DEFINE FSP_BIN_PKG =3D CedarIslandFspBinPkg > + DEFINE IIO_INSTANCE =3D Skx > +!elseif $(CPUTARGET) =3D=3D "ICX" > + DEFINE FSP_BIN_PKG =3D WhitleyFspBinPkg > + DEFINE IIO_INSTANCE =3D Icx > +!else > + DEFINE IIO_INSTANCE =3D UnknownCpu > +!endif > + > + # > + # Platform On/Off features are defined here # !include > + $(RP_PKG)/PlatformPkgConfig.dsc > + > +[Components.X64] > + $(RP_PKG)/WilsonCityRvp/AmlOffsets/AmlOffsets.inf > + > +!include $(RP_PKG)/Include/Dsc/BuildOptions.dsc > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets/AmlOffs > ets.inf > b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets/AmlOffs > ets.inf > new file mode 100644 > index 0000000000..8945f372e3 > --- /dev/null > +++ > b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets/AmlOff > +++ sets.inf > @@ -0,0 +1,26 @@ > +## @file > +# Generate AML offset table EPRPPlatform10nm.offset.h via edk2 build # > +# @copyright # Copyright (C) 2022 Intel Corporation. > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent ## > + > +[Defines] > + INF_VERSION =3D 0x00010005 > + BASE_NAME =3D AmlOffsets > + FILE_GUID =3D d7641589-753a-44c5-91c2-bd09686205c= 6 > + MODULE_TYPE =3D USER_DEFINED > + VERSION_STRING =3D 1.0 > + > +[Sources] > + > +WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/Dsdt/EPRPPlatform10nm > .asl > + > +[Packages] > + MdePkg/MdePkg.dec > + WhitleySiliconPkg/SiliconPkg.dec > + > +[BuildOptions] > + # add -vr and -so to generate offset.h > + *_*_*_ASL_FLAGS =3D -oi -vr -so > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py > b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py > index a0c31e4558..5f625f5f92 100644 > --- a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py > +++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_board.py > @@ -23,6 +23,7 @@ def pre_build_ex(config, functions): > :returns: nothing > """ > print("pre_build_ex") > + > config["BUILD_DIR_PATH"] =3D os.path.join(config["WORKSPACE"], > 'Build', > config["PLATFORM_BOARD_PACKA= GE"], @@ -53,6 > +54,68 @@ def pre_build_ex(config, functions): >=20 > if config.get("API_MODE_FSP_WRAPPER_BUILD", "FALSE") =3D=3D "TRUE": > raise ValueError("FSP API Mode is currently unsupported on Ice L= ake > Xeon Scalable") > + > + # Build the ACPI AML offset table *.offset.h > + print("Info: re-generating PlatformOffset header files") > + > + execute_script =3D functions.get("execute_script") > + > + command =3D ["build", "-D", "MAX_SOCKET=3D" + config["MAX_SOCKET"]] > + > + if config["EXT_BUILD_FLAGS"] and config["EXT_BUILD_FLAGS"] !=3D "": > + ext_build_flags =3D config["EXT_BUILD_FLAGS"].split(" ") > + ext_build_flags =3D [x.strip() for x in ext_build_flags] > + ext_build_flags =3D [x for x in ext_build_flags if x !=3D ""] > + command.extend(ext_build_flags) > + > + aml_offsets_split =3D > os.path.split(os.path.normpath(config["AML_OFFSETS_PATH"])) > + command.append("-p") > + command.append(os.path.normpath(config["AML_OFFSETS_PATH"]) + > '.dsc') > + command.append("-m") > + command.append(os.path.join(aml_offsets_split[0], > aml_offsets_split[1], aml_offsets_split[1] + '.inf')) > + command.append("-y") > + command.append(os.path.join(config["WORKSPACE"], > "PreBuildReport.txt")) > + command.append("--log=3D" + os.path.join(config["WORKSPACE"], > + "PreBuild.log")) > + > + _, _, _, code =3D execute_script(command, config) > + if code !=3D 0: > + print(" ".join(command)) > + print("Error re-generating PlatformOffset header files") > + sys.exit(1) > + > + # Build AmlGenOffset command to consume the *.offset.h and produce > AmlOffsetTable.c for StaticSkuDataDxe use. > + > + # Get destination path and filename from config > + relative_file_path =3D > os.path.normpath(config["STRIPPED_AML_OFFSETS_FILE_PATH"]) # get > path relative to Platform/Intel > + out_file_path =3D os.path.join(config["WORKSPACE_PLATFORM"], > relative_file_path) # full path to output file > + out_file_dir =3D os.path.dirname(out_file_path) = # > remove filename > + > + out_file_root_ext =3D os.path.splitext(os.path.basename(out_file_pat= h)) > # root and extension of output file > + > + # Get relative path for the generated offset.h file > + relative_dsdt_file_path =3D > os.path.normpath(config["DSDT_TABLE_FILE_PATH"]) # path relative= to > Platform/Intel > + dsdt_file_root_ext =3D > os.path.splitext(os.path.basename(relative_dsdt_file_path)) # root and > extension of generated offset.h file > + > + # Generate output directory if it doesn't exist > + if not os.path.exists(out_file_dir): > + os.mkdir(out_file_dir) > + > + command =3D ["python", > + os.path.join(config["MIN_PACKAGE_TOOLS"], "AmlGenOffset", > "AmlGenOffset.py"), > + "-d", "--aml_filter", config["AML_FILTER"], > + "-o", out_file_path, > + 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")] > + > + # execute the command > + _, _, _, code =3D execute_script(command, config) > + if code !=3D 0: > + print(" ".join(command)) > + print("Error re-generating PlatformOffset header files") > + sys.exit(1) > + > + print("GenOffset done") > + > + > return None >=20 > def _merge_files(files, ofile): > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg > b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg > index 1676c08813..4cc9496153 100644 > --- a/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg > +++ b/Platform/Intel/WhitleyOpenBoardPkg/WilsonCityRvp/build_config.cfg > @@ -34,3 +34,18 @@ FSP_BINARY_BUILD =3D FALSE FSP_TEST_RELEASE =3D > FALSE SECURE_BOOT_ENABLE =3D FALSE BIOS_INFO_GUID =3D 4A4CA1C6-871C- > 45BB-8801-6910A7AA5807 > + > +# > +# AML offset table generation configuration options # All paths should > +use / and be relative to edk2-platforms/Platform/Intel # > +# AML_FILTER - AML filter is used to strip out unus= ed AML offset > data > +# AML_OFFSETS_PATH - Path to INF file that builds AML off= sets C > source file > +# The directory name, DSC file name, INF file name, and BASE_NAME must > match identically > +# DSDT_TABLE_FILE_PATH - Path to DSDT ASL file for the board > +# STRIPPED_AML_OFFSETS_FILE_PATH - Target AML offset data file > +consumed by UBA driver # AML_FILTER =3D \"PSYS\" .\.DRVT\" > +.\.FIX[0-9,A-Z] BBI[0] BBU[0] CRCM BAR0 .\.CCT[0-9A-Z]\" > +.\.CFH[0-9A-Z]\" .\.FXCD\" .\.FXST\" .\.FXIN\" .\.FXOU\" .\.FXBS\" > +.\.FXFH\" .\.CENA\" .\.DRVT\" .\.CFIS\" {NULL }; AML_OFFSETS_PATH =3D > +WhitleyOpenBoardPkg/WilsonCityRvp/AmlOffsets > +DSDT_TABLE_FILE_PATH =3D > +WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/Dsdt/EPRPPlatform10nm > .asl > +STRIPPED_AML_OFFSETS_FILE_PATH =3D > +WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/AmlOffsetTable.c > -- > 2.27.0.windows.1