From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.1657.1651090701101883485 for ; Wed, 27 Apr 2022 13:18:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=SXZ4unLA; spf=pass (domain: intel.com, ip: 192.55.52.115, 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=1651090701; x=1682626701; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=///h8uMc1lkGBcA2nASWQ8R6JPVaL87jSRdcRVaME20=; b=SXZ4unLAjvBnnWijTAUrGg1CDwRncyYRsfoDQhiscv5qrVSDqEdM0NIk 0u9CtbCvQdJmIbt1AnOpFouedDLwfF48xWNSD2SyYXMz733YHPjnaxbGI zooREkrcvA2Z3vamXIWcDzf4+y3qr29kbNAgWyvMpcqBcIJVCESPD8IOp F6E3q3FwxgoFJb8uFTfuJji83iePd4bTNY7Lxc0AIZJHeb/wf2GtL2Sts xO1BGw1oXbRPrlT5rHfOtUej5mpM+5S1W3IvI58kPbdOmw+NXVKpw6JCx LOikyPKG8UF5E3HvH5UdWPR+IQP5s5zGDqKRPM14Cx3wmd9yDR3jXlorM Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="266221181" X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="266221181" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 13:18:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="565245967" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga007.fm.intel.com with ESMTP; 27 Apr 2022 13:18:20 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Wed, 27 Apr 2022 13:18:19 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Wed, 27 Apr 2022 13:18:19 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Wed, 27 Apr 2022 13:18:19 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.101) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Wed, 27 Apr 2022 13:18:19 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S8JYf3meRY+YZ80AF8PieXpIPUNZd6BMcJcwGCh9KLVd0pEtra8SQLwgW7iy9MeTiBjTk5jfMsHhhl+4c/KIhcaLvLd3RANP9dZkDyXlPGZ9l+PRfhXn+lX1sT8zrLRem8Vkv+zNoLJSXEQry9Ik0+/4U1PRlsuOYzk6j04S5ZtZvXM6ZHm7SEHWcICnlxseo9YMKlarmS+x5xOUSyBotxr+p6nmiaOMiSmrr/dhN3mpYGHon4Ei7XgirRkMnlMQ5a6lgxNfBXiXarihLVe9932Oqwd4sbD23LCQZxLnRC5nICjXzd2/M92m1WtmCMjCWMH+drkqVtvMof+h/gJU+g== 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=mxIKFAHMKlP7lHq1sQJXlfFLdii/niiRkzmQg/GnfE0=; b=B/RTd8FMZbadAqfe/Z/38bicC7zBa1auqFJKss41rW67u4O74ipcaqPXQb1y7jIgjaiCq/vSjtg1f/TpKuUlWh/N7usm85N5YO5i67xFN7nw6sQ96kut0hcEGqtUCzl2O5NXhlTxFFhu4ltGcT1LzhG5ZgQXGrveCBHB0lKF55iJ9+rKdQ8TUHcclcoCz4hWCa8gahRhq5YLE0L2JckwRkmydNxYx7kS68zZAsIGAn3zw4z/xiTDFamI6cqKDOWdGEcYusZKyfCLnmGc95fjwzDujx6ZmUo3ynFe/+EnVtsNqfIoRXzCxATfOfk39y8stZczP+HRD/3Bqua5MvWdlQ== 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 MN2PR11MB4413.namprd11.prod.outlook.com (2603:10b6:208:191::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Wed, 27 Apr 2022 20:18:14 +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; Wed, 27 Apr 2022 20:18:14 +0000 From: "Nate DeSimone" To: "Oram, Isaac W" , "devel@edk2.groups.io" CC: "Chiu, Chasel" , "KARPAGAVINAYAGAM, MANICKAVASAKAM" Subject: Re: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/JunctionCity: Build ACPI content Thread-Topic: [edk2-devel][edk2-platforms][PATCH V1 1/1] WhitleyOpenBoardPkg/JunctionCity: Build ACPI content Thread-Index: AQHYNaATJJFNwq+j9Uymi64pDZXyna0EfIHg Date: Wed, 27 Apr 2022 20:18:14 +0000 Message-ID: References: <091b469e6753bd047462f3352966db368c73e724.1647040345.git.isaac.w.oram@intel.com> In-Reply-To: <091b469e6753bd047462f3352966db368c73e724.1647040345.git.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: e67a10b2-ea5d-4121-83ce-08da288b0ed7 x-ms-traffictypediagnostic: MN2PR11MB4413:EE_ x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr 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: vB+B5dbNcDibPKZchXrr3VUctY+zCRhydmIZlgMO34tARKYSvIc0B3GjN2LdyTwnAkcMW0jNT66ehEyy1I4AKs5t1G9fgdrAVJDyaR/OShAAR4qmJ5locTOrcK81luVP16Hmzc4YEEOhc9LBZXU2iqxsy6vzG2/bve6AJoHq8A0cmZ6FLSmcBRe5v23SfgZMOVltVeiY7gdyvEufbnmabTpIpj61OT5uUiYbSUE6MzaQRTlwlC+NrWPLLYlMnTv7MvfFieiQ/AkjEUVmg41VSDqgQcPxM/5it8EJuTIlnQi4ikqVk8uc/Y+ArA7zrvidKIeaLsOLZNJYKWpW8mIHmHYSIEMGGZsvIVYTFaYdUXs9l5KUmEJl6Z6Vh0qsxQdrGN0GJUJI2r3uqgH1QKrWxLPc+5a0e+Sb2rAjUT3XhyvYkmsOh18jvRYzycBY+60Naoi4Mrx9rvQgXhygm9+tbsjFM4ubWsIaUPgYJFciaEaonffy5/Gl9s+U9+5zkag6DOmmAKhAkVLIWuqEc0r8aguMTh56Qv9Z7E3tiD6nhyqL7sBDD8ca170bwbQpsbxUdBsT1euqiA8Gkc1O+4k6vCdDQ4tbSpuI02y/B0VeZsLS3xSPlVse0v46J/ztdM27hUSHJx78k2iZCKCge99nA/xJyW8928LajGVy6hWuCWkgrxgjJmgRYdJ4C7fikFbm70GJA7mwEKsFM1rTnxM2DA== 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)(83380400001)(52536014)(71200400001)(66476007)(19627235002)(54906003)(76116006)(64756008)(66556008)(5660300002)(66446008)(110136005)(4326008)(8676002)(316002)(66946007)(53546011)(122000001)(508600001)(86362001)(186003)(8936002)(55016003)(38100700002)(82960400001)(38070700005)(6506007)(7696005)(9686003)(26005)(33656002)(2906002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?CkSTBYjpWBfM391TD5Wf4GQGHvKkwFHFKpuQp+VhTj8PYdz7vF7KGPA3rziQ?= =?us-ascii?Q?J2oOuqnibXbFwS4TD5CWmdkYDbYKc2m3Cd7XwS77jS727M6jJJn0Np2boNGK?= =?us-ascii?Q?e6/2QIRxGr9rDPdqv6+/BrgAAORLUDOYHSwowx/F8SNCH7mQVWWHWrwMG2v1?= =?us-ascii?Q?2CvaoDCEgTu3o7CzlWKMkbnQqbBuMWCeni1ayim1/ObOS5jMz5zNidOqam8p?= =?us-ascii?Q?Vd8zXhoO7l5AVP9xMuaTuYi+TlnLOZPIjSJN6LoNHtp4xQqE4mMpKLdE0tDZ?= =?us-ascii?Q?PbTzcR5wqLFHsJc0c9XJ4gkkDvXC54hR7gCMDUIZaVUmhExWDESFRVxbBqiP?= =?us-ascii?Q?+YN0zvIngIGoFqeli6zz7t3XgommT63MVQDomAoVQ/HWGLQn7XfVUQ0GZBtu?= =?us-ascii?Q?rcbZy3nvaWK6H33yLu4gxXN/+rxAPywi9kRqKosdis/6xCENp7Fvs5Xpw5dn?= =?us-ascii?Q?1DpGTCkD5ynGf9ksSsm/HABVNiPALKOFZEDcStaVGN9zRuUxltwe/6nMFBCn?= =?us-ascii?Q?0XelAlNC2qm3BRBdGEolE6155UpyIR7yffUgavKSzBRQQEc6UubKSQTGX3dA?= =?us-ascii?Q?fYsQyea5lNlYThUL1amm9Btic9StTBija7DcU+RsW9DW0yFmDqNbeMUufLok?= =?us-ascii?Q?+vNAZXu9lIApki+2KsqQRz1cMAHQwdu453zyE9fkZsKphURu/V5vw9p4nzXh?= =?us-ascii?Q?cxgzAE+2DP+TC2J3dSXgBwTDK4haGYZpA6bsAEMwOwdwmHKiDXuXhmanHb8C?= =?us-ascii?Q?gcJrHgVagGjPoOkr8rLxUXi4hrhaQpBZUNHUezDr1MWzOUYoTmh2wGNlyXkW?= =?us-ascii?Q?sYoWgimY/1KBgxuO0Cw18T5r1ZgYvZyg7tGsoTzpcswqGJUiofLytlAZp/rW?= =?us-ascii?Q?dpkBOl/YRO03mBAduIsiiKYcZ+Lh/c0XdZMNhthAp4pZm7+SA/wtq9OeihuG?= =?us-ascii?Q?/xMfgG0ooGiDpFCri7ecIhqGUblinLg/NaewzWZONlRZoI6s5978JscPa+xk?= =?us-ascii?Q?8EuxeN9wFJHpceSFLwf6skMXlvu4ilL7QlnYnFYNMf+EqQjC2lnuSjFPO0W4?= =?us-ascii?Q?WFO4qDxsNp1GNP/cT1eCs1r9nwbTO/gBPUVbOI83jcHT8QT59VveHhMxntym?= =?us-ascii?Q?RPTdBEG0ls2XNkNGt7FDaEocUrv5At9FluTU87TBAclVqtKQIFwnZj6FED+I?= =?us-ascii?Q?MMZL8+EBKRR1nqbVgk5BPnEwDoKUztvC15Ubl1Znfuj5/dCi+rbgXO5JjSWX?= =?us-ascii?Q?rVuMCZGEXvuvD9qVOwOqnnwBNKpH1K4Gvo7PdQui+WjhQgb8qdg5Xe4CbzVr?= =?us-ascii?Q?nSOrdFNCoes8vqZK4hdfIKk2buwlrJjV2ek969UxxXi6IQGJp0n0WA4O5gic?= =?us-ascii?Q?OZEg4xrAPd2179AyaeCh0x6WIsmq6o5BVraDD6GPhwwcXIwRqtzyjANQVvsZ?= =?us-ascii?Q?g6JwrJlJMRIFVTO4sS9IVCeuC4YzYpreW1cezT/q+oiZ+NdowVvJnszZGvtK?= =?us-ascii?Q?gN3KTHLdfkAnpmhtl3lLOWQ487VWswZU8WFVY9kT2SgHwHyjwewAjQxoLLmM?= =?us-ascii?Q?u4ShRN32XB8OflNioIaQAS/cmfeq3DeJsdmUcmKvgOECLYAbQ0kQIu9EaEpQ?= =?us-ascii?Q?bbT+JZEgQLn8gSe60NpB6NvQroktIO0STaSgkrm+O/XkFLOVm+FkSmgHazFN?= =?us-ascii?Q?T6mAGYSZJ1ioE8u/tdIZfDC+uLJQ+ad61fWbUxql8BHxQZ/nMSYzzo87KnPx?= =?us-ascii?Q?Dv/PcwuG0kcX8Yhk6mKH5CFC6Uma9gk=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: e67a10b2-ea5d-4121-83ce-08da288b0ed7 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Apr 2022 20:18:14.0760 (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: GcTo24NBLvMnvJ/gHCVEQE9tcGGjjNHV+N2sz3QZMn/L0ux0Sy07YNfhIIPC8eZ5hV+vvKcZH5f4QJ5mnLjo9DP4PrP/a0YkKIPq+0eWGlA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4413 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: Friday, March 11, 2022 3:31 PM > To: devel@edk2.groups.io > Cc: Desimone, Nathaniel L ; Chiu, Chasel > ; KARPAGAVINAYAGAM, MANICKAVASAKAM > > Subject: [edk2-devel][edk2-platforms][PATCH V1 1/1] > WhitleyOpenBoardPkg/JunctionCity: Build ACPI content >=20 > Use source versions of AcpiTables, AcpiPlatform, and StaticSkuDataDxe. >=20 > Cc: Nate DeSimone > Cc: Chasel Chiu > Cc: Manickavasakam Karpagavinayagam > Signed-off-by: Isaac Oram > --- > Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf | 3 + > Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py | 63 > ++++++++++++++++++++ > Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_config.cfg | 15 > +++++ > 3 files changed, 81 insertions(+) >=20 > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf > b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf > index 0b919b5ea9..b72aa2b688 100644 > --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf > +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/PlatformPkg.fdf > @@ -601,6 +601,7 @@ SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize =3D 0x01000000 > # UBA DXE common and board specific components > # > !include WhitleyOpenBoardPkg/Uba/UbaDxeCommon.fdf > + INF $(RP_PKG)/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf > INF > $(RP_PKG)/$(BOARD_NAME)/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe > /UsbOcUpdateDxe.inf > INF > $(RP_PKG)/$(BOARD_NAME)/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/ > IioCfgUpdateDxe.inf > INF > $(RP_PKG)/$(BOARD_NAME)/Uba/TypeJunctionCity/Dxe/SlotDataUpdateD > xe/SlotDataUpdateDxe.inf > @@ -682,6 +683,8 @@ SET > gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize =3D 0x01000000 > INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf > INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf >=20 > + INF RuleOverride =3D ACPITABLE > + WhitleyOpenBoardPkg/Features/Acpi/AcpiTables/AcpiTables10nm.inf > + INF WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.inf > INF WhitleyOpenBoardPkg/Features/AcpiVtd/AcpiVtd.inf > INF MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf >=20 > diff --git > a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py > b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py > index 33698f9809..72d0c5089a 100644 > --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py > +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_board.py > @@ -25,6 +25,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"], @@ -55,6 > +56,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/JunctionCity/build_config.cfg > b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_config.cfg > index 8744e9072c..3b66995128 100644 > --- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_config.cfg > +++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/build_config.cfg > @@ -35,3 +35,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