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.web12.1739.1651090938136323780 for ; Wed, 27 Apr 2022 13:22:19 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=S3thVlzs; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: isaac.w.oram@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651090938; x=1682626938; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=gB4BZyjePQ8+VmGU1+AUGwfue7cAlxnLk1/tP5fpCAA=; b=S3thVlzsvbziK4TzjxJPevZ1OHZf0twRWhS3lXXpJ7FStIvbaS4njTuW YOfVEFVAwGSBKt4kNARfvZH8yqbgpXYAtx3tnp6pkeXxHBDHc/+0Waryb llEOPp4+7r0jAsspIzI0vzmP3uCqT9IE8GLVdA1ojA5m7w072NKJvguOG oHF15E3d2rDdOKJ3nDyzJXSaE6K96bsgUnC1E8pp/RPIHTW/dAQb4xu3n 1LLcsTkjVmxe6Z8hRpKiFlA772Qehppg2DUAVDuncoxdGLwZgcW/7WDmo kOrUR5itI+qU6brw8QXhQH7ydpS8uXSkRx3T3o48bhxu5NArV23ETVaKy A==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="246619792" X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="246619792" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 13:22:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="565247913" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga007.fm.intel.com with ESMTP; 27 Apr 2022 13:22:17 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) 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; Wed, 27 Apr 2022 13:22:17 -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:22:17 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.45) 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:22:16 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSphiTgI1ntXFqKxPY456I6VmiqKIsBrSQ6Pc2Ht0cFREFsnryyvpZr0KqnpmlL/WIufVY51jAv2rKYmdCX/ovtD1Trb85N5+kEmgbKWJzmhDsU8XxMNPuyik9+G9UjuPBH3x1UlwT/Iphs/k9GJ96744HB3DtBlVe8Q+zdjWXHUKkxLVbrLg94D5XJWIr8yzoXbxOhDPy1YW3opftAPfuOxrhxoRB9R98Ri9IQUjj2zZLbGf63AFpEQVUeOUpKXxs1DLXQ0QJUohBaTW2UlusaaUdr5Lx2xKk3hVi/083VfJAPBiOAgdAXeyrPSZre1Wxzp4WTFuRXzAXdA7YiyGw== 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=C3dTgw+gtHyD9UuDKN7uRmJAWyCCMfSYgd6E37q7NAk=; b=WU8Mnri/q6CfD7WCPA8p/ptPi3BoEGs4IvorU9RaDK3HhOMiy53TJoYPKczux1TujwYm2sz+W+JIeYpSvZrQt305Z//MA0u7dUL6GpQsRkcC6KlZg31XT1Uu6Dkg09UelxFkRgK/pMANyrBc0C7WQTnuLyH34OgM1t6rw+mP2W3OlA6IzFL2lgcVI3lSIz1f10gV53LVf4VRtZ8/yqDkMaGf3U3jaRDbg901TC7klX83wPyLCMqCC0h7rFWrIDCvNboxsAaVHZzd/FpxVz41iJ/1LFKJx04f00LQNiyCmYwUeHrCUdhTlo4TEgzk4e8JhPkuQTLDdDgrrFmxQibHxw== 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 MW3PR11MB4747.namprd11.prod.outlook.com (2603:10b6:303:2f::11) by DM5PR11MB0009.namprd11.prod.outlook.com (2603:10b6:4:69::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Wed, 27 Apr 2022 20:22:14 +0000 Received: from MW3PR11MB4747.namprd11.prod.outlook.com ([fe80::8d7f:e5e0:8bb7:4cad]) by MW3PR11MB4747.namprd11.prod.outlook.com ([fe80::8d7f:e5e0:8bb7:4cad%9]) with mapi id 15.20.5186.021; Wed, 27 Apr 2022 20:22:14 +0000 From: "Oram, Isaac W" To: "Desimone, Nathaniel L" , "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+j9Uymi64pDZXyna0EfIHggAABEmA= Date: Wed, 27 Apr 2022 20:22:14 +0000 Message-ID: References: <091b469e6753bd047462f3352966db368c73e724.1647040345.git.isaac.w.oram@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.401.20 dlp-reaction: no-action 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: a57ffb63-b804-4084-65a7-08da288b9e27 x-ms-traffictypediagnostic: DM5PR11MB0009: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: M4ScIO5AabS0WOuL2jtLLftj823AJejc/JMIWbyETz0vmmKriFvNqQSkMBsvRUg84CqK7VV/nWHCirbQmYXwMNAfgRDrEYSscSPBB9cqbd2VW5rKDVijGrl30Mw+mbEIS1EFs5gbwLQxnCQxip8I14xAtDVO2zvEsZcK2fuCA7H47RWywodR74N4VsA5xEudDZqYYMNvwvipM9Ns4TMtlPMq18+hRwamXU3frOtwET/ZqYKl7AIo8uftQbviJrL1gDVSgkXwxFpYIMYKS139/uWgwPMYsimmTEFrpWcnZze0N95qoqQePu7GTgXkUWrW2YsFYwdX4H6i6LeTQ2RWGwN6RUGsG0V0XrYQC1yG0a1veHIYItjohA85GjFudz9ACqT8GtJK9tFfg3bODrqzivNUWhwCI9ckXpMtvs9Fmy3rCYSdOyUbHHs0nNr+8d3brKz7XlfiINMMjaeiuas9/1waKb4FPMiVJj/gY7fidsBqpgVoA2f+lfbduJFZyNulLU4DDbDlYT1T1zX9c8ry0mCbIYoxmer1Yv1liPqSHx2y5/BVVeoE64GOqYT6cDH8PZPzOubFpZcg2gkDVlWZv8K8aRcjcSOA6BquMaINln0dr0KyJtkk/2lLMttLpK/VbP1uuobyeNzOd1VFIefcper/O8YOv2JOH+JXjuJnP+IQaeKhgyo/zbEcPztKNcoJceTO1FBx/ihnfm8dRZ6UeA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MW3PR11MB4747.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(64756008)(8936002)(66946007)(76116006)(8676002)(52536014)(66446008)(66476007)(66556008)(33656002)(4326008)(508600001)(83380400001)(6506007)(122000001)(82960400001)(53546011)(7696005)(86362001)(2906002)(9686003)(26005)(5660300002)(186003)(71200400001)(38100700002)(54906003)(316002)(55016003)(38070700005)(19627235002)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?rHSauoLjT+VruQA0DMFHf9g4WtWwSsJiJTLbc33AIw8btPZcUAo+PS2a9S2p?= =?us-ascii?Q?YcGHbfuLMGPCFB0K+zw5NT54ezaUPceT4JrYjiWXR7DAxGiBajtXsU7I+K/j?= =?us-ascii?Q?CYTelCXYDpH+Fbr/CCWmPCUPYdBZ7FMIfgt3+0T144r5+pk1uJXvv/CXAVQ5?= =?us-ascii?Q?/sn3riMq/JsbKCyppDQM2eVX6hGXBCCaRVV2hzF0U9aGcqZbqi07PLLcgOAj?= =?us-ascii?Q?FsnuTUz8mxKPzCm/SbxyBy1p1uQBhfiXAO2KXwtK5nDUeZJdNurarDK7Xpch?= =?us-ascii?Q?dQPF0vjAYxtJ147nUzU2bgNQa9G4YoV9rtbeiOXcrmqK6GqiKfAWZFLqfdOa?= =?us-ascii?Q?N07vcoksSibP8oRsEKfFfVBxuCqelQXQisOSLOF711dWKUBCzjg4IDcyOqaR?= =?us-ascii?Q?hOs8QfCfZL5FmpnaCTGK2wDC/fo/q79z5ZreLL0r5fg/epdH32JcW5WsofoT?= =?us-ascii?Q?4j7nmIsHsrt8iA9xRxjLh+os3a2k93LK8kCJiS6wfjubMeHqtFWJhZpyyHuD?= =?us-ascii?Q?vmohG+93FPmdsiih2LwjXIP4buoj747pesYeegeh/KXPmwjJ8uQcxN6OkJy+?= =?us-ascii?Q?tJtaViJSXNOCyC8wudc1ot7x01OG+mXwJvTq0Aho3pVvQPrz/d8SZQmuY1rl?= =?us-ascii?Q?afbOJ7aYrwNBKcUXNjiyKdlymNK8HFquSMW8jaOK+5JLeDAnbTORXH+vYIhg?= =?us-ascii?Q?aEpbqCzVSQPkHQOE3u0v9P+R6W6MqfTH6PccYJxfM7Tv38gMUPF3AlSP5pOs?= =?us-ascii?Q?sQrJPSCRiCLf/Vk+uKmS7qBkTuteJsUlrIxD3mEccdqWTSCdxL1cLLbJSDso?= =?us-ascii?Q?Upyu01ypQIFwxVHNT+q7avUYitS6iuIXydHTGpAKj7zlCq7JnHB3OX5Ep7XY?= =?us-ascii?Q?yui6RgD67IwiH6ND5mA21tGnR/in9An19Dy8IhqqFl/otLmQrjREO9yU3YEs?= =?us-ascii?Q?cIzCgAt2M9LYw2QTXuHpZqtv36IhlOEnWbPIzbzumEXULt4unxzQ+590fila?= =?us-ascii?Q?Iz3bUuhdqlzy2ZJN8hkRAnLyVjneW0VyN7u8tiAY0A1dv+gFN6Kxd2hpRSM6?= =?us-ascii?Q?PA2vS1U9eMP0zSaRNE4j7SRfkg13IECwuNg9KJwParbrFllgcVVVCmTqdSQB?= =?us-ascii?Q?hWaBH7muqVggFvXjnpjYei/62WVcFc7M1jbNhD43QMkxWTGzyuBMi5o5QRmz?= =?us-ascii?Q?00hJ10kh9UN3Tb2Z8jNn/2T8Mur6vU9OXOf+MbCDec3i1+S4DxA+KuGbHifA?= =?us-ascii?Q?UuNlhs6x18ynEcJDloQ0HCNObRuSFC78/Ij1ocmsqTPo0mysXxYbFWeufZSb?= =?us-ascii?Q?34o4QPAVCnd5qNszoh5SDYCDZMWZr7exLG2abdQnNdj8tW6aakKZvs7BzPS1?= =?us-ascii?Q?8LUFCAaJQBI2tCPD2kKbiuJGH9VUP5EGwky49py9bK0yrGMLVxtPbtmNUiPW?= =?us-ascii?Q?GIzbusz9fUncWfTXnm4dOW/2fwusoWjbhreoMFQKjf1reaelrdznh4WKUvhG?= =?us-ascii?Q?XXF+3Wr4x4tQY3nJXiGBQ9xH3PTnwQuxkZ8I3qD5ahk5K1fG6wcx0a8L/v7p?= =?us-ascii?Q?/RDZgnz6iTxIclMFjeW3khXg/w4Ovvo3WLqAr9dEgssWfPQXTz2u0xclZDs7?= =?us-ascii?Q?0OvwMWaVew7K3P4FK8Iv7eZvS3Gz/0VHAHKmx3rlVQpsHA+7m7xgbilPTZWy?= =?us-ascii?Q?D5fCM21/6HmuW5AgdL/gfa3ZDg6ufkbkx5N7K1su2PxLyUPVQ6GtD2HwYxmd?= =?us-ascii?Q?4gfITV9yyNYIIzBsUtwiLUvqIfbJucc=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MW3PR11MB4747.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a57ffb63-b804-4084-65a7-08da288b9e27 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Apr 2022 20:22:14.4981 (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: A8HjKOW6mwsEiDZnmh7s+NxYTen/xd2M7V326GTQmstyyF76WfNg2KfHcv42jykiL9rekOQBJ8DsUMBtWOOODA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB0009 Return-Path: isaac.w.oram@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed as: c06b98a171..1ba46425cf -----Original Message----- From: Desimone, Nathaniel L =20 Sent: Wednesday, April 27, 2022 1:18 PM 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 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,=20 > Chasel ; KARPAGAVINAYAGAM, MANICKAVASAKAM=20 > > 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 =20 > + 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', > =20 > config["PLATFORM_BOARD_PACKAGE"], @@ -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=20 > Ice Lake 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=20 > + 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=20 > + os.path.splitext(os.path.basename(out_file_path)) > # 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"],=20 > + "AmlGenOffset", > "AmlGenOffset.py"), > + "-d", "--aml_filter", config["AML_FILTER"], > + "-o", out_file_path, > + os.path.join(config["BUILD_X64"],=20 > + aml_offsets_split[0], aml_offsets_split[1], aml_offsets_split[1],=20 > + "OUTPUT", os.path.dirname(relative_dsdt_file_path),=20 > + 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= =20 > SECURE_BOOT_ENABLE =3D FALSE BIOS_INFO_GUID =3D 4A4CA1C6-871C- > 45BB-8801-6910A7AA5807 > + > +# > +# AML offset table generation configuration options # All paths=20 > +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=20 > +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=20 > +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