From nobody Thu Apr 18 03:13:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+63247+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 15956057366771001.8613667766559; Fri, 24 Jul 2020 08:48:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1cdXYY1788612xv9V7hVrrPr; Fri, 24 Jul 2020 08:48:56 -0700 X-Received: from EUR02-AM5-obe.outbound.protection.outlook.com (EUR02-AM5-obe.outbound.protection.outlook.com [40.107.0.75]) by mx.groups.io with SMTP id smtpd.web10.8908.1595605733858382163 for ; Fri, 24 Jul 2020 08:48:54 -0700 X-Received: from MRXP264CA0043.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:14::31) by AM6PR08MB3045.eurprd08.prod.outlook.com (2603:10a6:209:45::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.22; Fri, 24 Jul 2020 15:48:51 +0000 X-Received: from VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:500:14:cafe::ed) by MRXP264CA0043.outlook.office365.com (2603:10a6:500:14::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23 via Frontend Transport; Fri, 24 Jul 2020 15:48:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+63247+1787277+3901457@groups.io; helo=web01.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT007.mail.protection.outlook.com (10.152.18.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.10 via Frontend Transport; Fri, 24 Jul 2020 15:48:50 +0000 X-Received: ("Tessian outbound 7de93d801f24:v62"); Fri, 24 Jul 2020 15:48:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5cfcb400abd3183a X-CR-MTA-TID: 64aa7808 X-Received: from a63cb0646c83.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A2A86E4D-E63F-4F67-960E-9A12DFAE350E.1; Fri, 24 Jul 2020 15:48:50 +0000 X-Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a63cb0646c83.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 24 Jul 2020 15:48:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VxEs+siAKTy6hpG1/W16XX6zMfZIvvVp4VwWzeJV55hQMJVE6p/ZvdnIK2L22Xk2mzNyDwVKbAzdpMqBTY3aUABnomUt5zuAN1v/iqSw5Q3RMZyUeVzUKLGRCuXDfUjn86pA5zruGuCWlmiVUDdpW4u61Q8SeF4JVkqZ4MdGaZEyRzcFiOKwGFpSPmVFEv7YBYxpCfUjM38QEwXpDoHJ06nYLpbsM0qYJjO022KemPXDppCI5OCIAXcuMeaznHeXmpjvr3loOQN+n28zXN+4FMIsknM3eQyvRIdpEo3iF2N7VBUrNHdgajN+NqntJXUFaOU86aElQ1Rq6+RPitAKOw== 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=MlIefUw3zn0xjcdwcQ9X01vqtdsHiSAsg8MoLXT9+vI=; b=ZD48Ozq/NqPZYFpP4Cqt39f9547Ncy/HKUfJmK8coGcSIeiSU6k34ufh0LnXPuv12Czi0oDe4FbKtQWgKdhR3PeKkBOFXAtOvRD1Qj+qx+wKOeSvHtRi+G04JVV5etOWqMATTvBYyDvbJ7or9jci4ayjlEWJC+qd/lF48Gcc9jWzS3/dOF9HRQUTYRYTFLWU6hyIsrFooFKltGin96kJLnutsQ050ikRIE+oeQc5zmlxWhJ4q6+khaBXfHH7HD1RFBDXNtS5sWyt2W2DT9orARkiAIdPe82QNPfaoMH/Ja+zwn76WSnGYJRN7xf9S5WGhTpQvTGm6zHrBgj5xhDObQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from AM5PR0101CA0030.eurprd01.prod.exchangelabs.com (2603:10a6:206:16::43) by AM7PR08MB5480.eurprd08.prod.outlook.com (2603:10a6:20b:de::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.24; Fri, 24 Jul 2020 15:48:49 +0000 X-Received: from AM5EUR03FT033.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:16:cafe::b2) by AM5PR0101CA0030.outlook.office365.com (2603:10a6:206:16::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.21 via Frontend Transport; Fri, 24 Jul 2020 15:48:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT033.mail.protection.outlook.com (10.152.16.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3216.10 via Frontend Transport; Fri, 24 Jul 2020 15:48:49 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1415.2; Fri, 24 Jul 2020 15:48:38 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1779.2; Fri, 24 Jul 2020 15:48:37 +0000 X-Received: from blr-smtp0.blr.arm.com (10.162.80.49) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Fri, 24 Jul 2020 15:48:37 +0000 X-Received: from E119881.Arm.com (E119881.Arm.com [10.1.197.28]) by blr-smtp0.blr.arm.com (Postfix) with ESMTP id 628A67F9B2; Fri, 24 Jul 2020 21:18:01 +0530 (IST) From: "PierreGondois" To: CC: Pierre Gondois , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 1/2] Platform/ARM/Juno: Merge ASL and CfgMngr directories Date: Fri, 24 Jul 2020 16:47:57 +0100 Message-ID: <20200724154758.333404-2-pierre.gondois@arm.com> In-Reply-To: <20200724154758.333404-1-pierre.gondois@arm.com> References: <20200724154758.333404-1-pierre.gondois@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 967e0c4e-5c40-4759-7182-08d82fe90fb2 X-MS-TrafficTypeDiagnostic: AM7PR08MB5480:|AM6PR08MB3045: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:10000;OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: JNJMFUqruwxf1myxnw3qMzxbjcx/4HhPmDX90vrz+UBTKcmReSHLGJ48UbuwJXmNa62Paca9/INPhXEWrCnyhubOt4fxJB0px4AgCgf8VWKOOyI9A+A7prCWwxYvSR+ZWesMluJXNk3fLY8uL2P+9hIunXd8AWAshN8/zz3h07e+/V6WyIv+IvJHhteegZkSdYOV590sd5fvHAlToq2eTbHxt4XVGawIr65yRJc8O2vvEbDhB/RNPt6t6G+4D0BECJArlrx2zbRZrcytHSw8/npJkLJwjR7qy2hXddF/XoQXHI0/Q78qb19eJzS6H0DaBvuM/wRtIMGyGHmpUDvNxqO9gSI8N/mrisiym38YsndZsY19cBRclmcOgbbDrqWtoMXxgxQHDRivTMTDrubv9tZxit8JZQsQxWAM24xNmi/ZLTl26bb4QeiIAvl0C1fUwcMQ0CdSNtezLH2RIRv0AH6B3hjM+jbfn29lxQ4d/FAHDqls6JTiDg4fU5w3f0ZMXUmUg6TDym3LucDb/uW/YA== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFTY:;SFS:(4636009)(396003)(346002)(376002)(39860400002)(136003)(46966005)(336012)(426003)(70586007)(1076003)(4326008)(5660300002)(81166007)(6666004)(966005)(2616005)(54906003)(19627235002)(186003)(86362001)(26005)(8676002)(36756003)(6916009)(82740400003)(6266002)(8936002)(2906002)(478600001)(83380400001)(47076004)(70206006)(7696005)(316002)(356005)(82310400002)(40753002)(133343001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5480 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: f1e73b87-df85-4ff7-0d7c-08d82fe90eb2 X-Microsoft-Antispam-Message-Info: 1ukfzfkEMKeemGyauNwR2Tnug5OcQnODYPaIKPYmSla/9kkbFwexerMSj8DKf9nHoUVaUwioClwtvgjPc7yEwOUKuTviKDpSi3q9Rkft4ONAigsG4EMvjVyJQZmeQH62ynXYAKZ97OtVSzIEPyG1UxTWrvxmTxAs3HOa+cmfpop+FNfax6tl+YIeSKf62aOUJaPw8G+lHa7+o2Ey7fuMfTEzX1vVBZP8rXXYn7lZmYSIxqCdu0vKr+Brpa9jDOkTxT0COM6hvdWF3B5PS9aWYkclI6uwFRIL96ZTa2hajXaoPHdLMavr7KTnB2Uy6X220SGRby5B7rxA0wrrr1WCaqEIFI6ehRdrr6r9Hg8QvL9HFBUUUB9VWLZxJxmt5Jsl/rFp4xkgUytJ2sPqY8+v4KiGyQfn6enOp0oZof2cgE3jVUuvpmrYsSzBj8eMRQOf7mRbmSR2Jf8vSJ1Crzti6GJcszO/zAvCReWdZGfjSQAztAY3KGUjAdSbowfLRtp2rZi6tN3jZHeAzCes7E/zcw== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2020 15:48:50.8604 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 967e0c4e-5c40-4759-7182-08d82fe90fb2 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3045 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: uWxaFJNKqFMGLdWKYzxo0PpPx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1595605736; bh=2Fp45/k6Hqr4XKLEw9XVelz2LOyJ3FsZ5gNItH4+fZw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=uvqQqTGm5RRooITEndoiVhiEPjL01SKYWo7Ng/LS3cpoIeCSFKpThBhJ4qjj4Tbv1IA uP9PeF+HS9Rbtzc7IMl4H6eRFjRXqrg5CL06We8uIb4Tbie/bHxrq4yh9PzIG4BTvyNRH cPkV1MJY0mh0pT267lnB1JvaiFhy9toQUl4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pierre Gondois Due to the following patch available in edk2: 0a4aa20e8d446c2f5dd54f3a0a7ec4d52f0ebdb6 BaseTools: Compile AML bytecode arrays into .obj file a C array containing the AML bytecode is generated from ASL files, and a .obj file containing this array is generated. The Configuration Manager is currently providing an extra flag to the ASL compiler to generate a C array containing AML bytecode. This C array is contained in a .hex file. This .hex file is included where necessary. This mechanism was necessary due to the impossibility to describe dependencies between ASL files and C files. This mechanism is not required anymore. Thus the ASL and CfgMngr directories can me merged in one module. This patch merge the two directories for the Juno. Signed-off-by: Pierre Gondois --- The changes can be seen at: https://github.com/PierreARM/edk2-platforms/com= mits/847_Merge_ASL_and_CfgMngr_dir_v1 Notes: v1: - Merge the PlatformASLTablesLib and ConfigurationManagerDxe directories. [Pierre] Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc = | 10 +---- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManagerDxe.inf | 7 +++- Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASL= TablesLib.inf | 39 -------------------- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.h | 11 +++++- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.c | 8 +--- Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib =3D> Confi= gurationManagerDxe/AslTables}/Dsdt.asl | 0 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib =3D> Confi= gurationManagerDxe/AslTables}/SsdtJunoUsb.asl | 0 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib =3D> Confi= gurationManagerDxe/AslTables}/SsdtPci.asl | 0 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib =3D> Confi= gurationManagerDxe/AslTables}/SsdtUart.asl | 0 9 files changed, 18 insertions(+), 57 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= .dsc.inc b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.d= sc.inc index 6699a016098623f9c8f567a8fa305b7cbf0b4fff..987c2d8ca3ba9757e36b9e16171= a280523107a7a 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc @@ -1,7 +1,7 @@ ## @file # dsc include file for Configuration Manager # -# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. +# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -14,10 +14,4 @@ [LibraryClasses.common] =20 [Components.common] # Configuration Manager - Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Config= urationManagerDxe.inf { - - # Platform ASL Tables - PlatformAslTablesLib|Platform/ARM/JunoPkg/ConfigurationManager/Platfor= mASLTablesLib/PlatformASLTablesLib.inf - - *_*_*_PLATFORM_FLAGS =3D -I$(BIN_DIR)/Platform/ARM/JunoPkg/Configuratio= nManager/PlatformASLTablesLib/PlatformASLTablesLib/OUTPUT - } + Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Config= urationManagerDxe.inf diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager= /ConfigurationManagerDxe/ConfigurationManagerDxe.inf index dd71f815db672f25f04713460acb2460bdc45699..a3e7db12f8c913f7111b5ff4ad7= 24a5bdcc35956 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManagerDxe.inf @@ -1,7 +1,7 @@ ## @file # Configuration Manager Dxe # -# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. +# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -22,6 +22,10 @@ [Defines] =20 [Sources] ConfigurationManager.c + AslTables/Dsdt.asl + AslTables/SsdtJunoUsb.asl + AslTables/SsdtPci.asl + AslTables/SsdtUart.asl =20 [Packages] ArmPkg/ArmPkg.dec @@ -33,7 +37,6 @@ [Packages] =20 [LibraryClasses] ArmPlatformLib - PlatformAslTablesLib PrintLib UefiBootServicesTableLib UefiDriverEntryPoint diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib= /PlatformASLTablesLib.inf b/Platform/ARM/JunoPkg/ConfigurationManager/Platf= ormASLTablesLib/PlatformASLTablesLib.inf deleted file mode 100644 index 93978cff97d9704f8639732c55d01bf559a5a2d6..000000000000000000000000000= 0000000000000 --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/Platfo= rmASLTablesLib.inf +++ /dev/null @@ -1,39 +0,0 @@ -## @file -# Platform ASL Tables -# -# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -## - -[Defines] - INF_VERSION =3D 0x0001001B - BASE_NAME =3D JunoAslTablesLib - FILE_GUID =3D 557004DB-DF45-426B-9E5E-1E8ABAA2EE2C - MODULE_TYPE =3D DXE_DRIVER - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D PlatformAslTablesLib|DXE_DRIVER - -# -# The following information is for reference only and not required by the = build tools. -# -# VALID_ARCHITECTURES =3D ARM AARCH64 -# - -[Sources] - Dsdt.asl - SsdtJunoUsb.asl - SsdtPci.asl - SsdtUart.asl - -[Packages] - ArmPkg/ArmPkg.dec - ArmPlatformPkg/ArmPlatformPkg.dec - MdeModulePkg/MdeModulePkg.dec - MdePkg/MdePkg.dec - Platform/ARM/JunoPkg/ArmJuno.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec - -[FixedPcd] - gArmPlatformTokenSpaceGuid.PL011UartInterrupt - gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.h index 7fdf663fc6d2ad80da26ff1f1635c858d5be4e93..2073ae4902e540de869612353bf= af0ebacaea50d 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.h @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -12,6 +12,15 @@ #ifndef CONFIGURATION_MANAGER_H__ #define CONFIGURATION_MANAGER_H__ =20 +/** C array containing the compiled AML template. + These symbols are defined in the auto generated C file + containing the AML bytecode array. +*/ +extern CHAR8 dsdt_aml_code[]; +extern CHAR8 ssdtjunousb_aml_code[]; +extern CHAR8 ssdtpci_aml_code[]; +extern CHAR8 ssdtuart_aml_code[]; + /** The configuration manager version */ #define CONFIGURATION_MANAGER_REVISION CREATE_REVISION (1, 0) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager= Dxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/Conf= igurationManagerDxe/ConfigurationManager.c index d52cc2982334ded1c3bf2f5e8f570378d8fb0ae1..913cffc9b994319065b5292b0d2= 8970a0a0d8320 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Con= figurationManager.c @@ -1,7 +1,7 @@ /** @file Configuration Manager Dxe =20 - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -25,12 +25,6 @@ #include "ConfigurationManager.h" #include "Platform.h" =20 -// AML Code Include files generated by iASL Compiler -#include -#include -#include -#include - /** The platform configuration repository information. */ STATIC diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib= /Dsdt.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerD= xe/AslTables/Dsdt.asl similarity index 100% rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/= Dsdt.asl rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe= /AslTables/Dsdt.asl diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib= /SsdtJunoUsb.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationM= anagerDxe/AslTables/SsdtJunoUsb.asl similarity index 100% rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/= SsdtJunoUsb.asl rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe= /AslTables/SsdtJunoUsb.asl diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib= /SsdtPci.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManag= erDxe/AslTables/SsdtPci.asl similarity index 100% rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/= SsdtPci.asl rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe= /AslTables/SsdtPci.asl diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib= /SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationMana= gerDxe/AslTables/SsdtUart.asl similarity index 100% rename from Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/= SsdtUart.asl rename to Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe= /AslTables/SsdtUart.asl --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#63247): https://edk2.groups.io/g/devel/message/63247 Mute This Topic: https://groups.io/mt/75768729/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 03:13:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+63245+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1595605727882184.21896467522117; Fri, 24 Jul 2020 08:48:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VeMQYY1788612xayuLM5KnwR; Fri, 24 Jul 2020 08:48:47 -0700 X-Received: from EUR01-HE1-obe.outbound.protection.outlook.com (EUR01-HE1-obe.outbound.protection.outlook.com [40.107.13.51]) by mx.groups.io with SMTP id smtpd.web12.8940.1595605724042424998 for ; Fri, 24 Jul 2020 08:48:45 -0700 X-Received: from DB6PR07CA0115.eurprd07.prod.outlook.com (2603:10a6:6:2c::29) by DB7PR08MB3609.eurprd08.prod.outlook.com (2603:10a6:10:42::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.25; Fri, 24 Jul 2020 15:48:41 +0000 X-Received: from DB5EUR03FT048.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2c:cafe::cf) by DB6PR07CA0115.outlook.office365.com (2603:10a6:6:2c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.9 via Frontend Transport; Fri, 24 Jul 2020 15:48:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+63245+1787277+3901457@groups.io; helo=web01.groups.io; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; X-Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT048.mail.protection.outlook.com (10.152.21.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.10 via Frontend Transport; Fri, 24 Jul 2020 15:48:41 +0000 X-Received: ("Tessian outbound c83312565ef4:v62"); Fri, 24 Jul 2020 15:48:41 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 2dd9a14cebdf9805 X-CR-MTA-TID: 64aa7808 X-Received: from c72c398bd6c3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D1B934C6-DD12-4189-A70F-68D19399C17B.1; Fri, 24 Jul 2020 15:48:35 +0000 X-Received: from EUR03-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c72c398bd6c3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 24 Jul 2020 15:48:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=URx1qkssSbJWpZv9XDIM+iNLyy3eoBoyH4yAByUJi+wHX2JDeTq9FX4j2LWoATw+oWkWaij5xlnQi+IMd4ZzKSUDLpzl8X8qHc+QSc3taKnQwKMEsu1xxw62MFyyrxTuMBIlVmPx2qKY0SiIVnTWvyf4MWqCLapX1e1mhxpqbhsxnSzS4D/mCyqpGhoUKHuorjrDb81tryQMWSe+PcC6ubBmWUCWSZJOetdtGBBImYDEgdYuBCBMFbiEbstk2g2ELygOXPNSVrj6gMFx3REZxZWyXhb5hYsTFgOgKPMlYFbGj279mhwuD3dYiBFjkWkQXsJAL32/f8Mg3l3+VTK5lw== 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=STr/riet0cmfpF8ZLGXrgYooUfvSHDXBjnp/1gEzFR4=; b=NFBwcwmsOft/u59PVlQ4OoZOUn182peTv7k0lkez+XUV90krDOPgSCGLu6bt3eQye29tQbrcjoLToT4c+5Kp0phJBPUDaAuGv7/TcB+RrXTmNOZIEnw6GwZUgbI15j4cMyCXE1Zy+bR0eFkdlJn5EQTIeegXYCpLr0df4c0wXL5QnVeKUmaKUzVJC7psX0yVJdFHUKzv4QjYKtWzwX3NeHoiT0xhXVNW/tLCoPfX4c4XG9jsG8porN4cGoipQGnBYuLHZ/oSEEDaawKRbNcy/+F43C/NHZVTKvvvlHIPEN7D4IuofNiS6ZlQ340Bowpf9wGYFX+Bt7b0vMpMYDQ61g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=bestguesspass action=none header.from=arm.com; dkim=none (message not signed); arc=none X-Received: from AM5PR0201CA0014.eurprd02.prod.outlook.com (2603:10a6:203:3d::24) by VI1PR08MB4000.eurprd08.prod.outlook.com (2603:10a6:803:dd::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23; Fri, 24 Jul 2020 15:48:33 +0000 X-Received: from AM5EUR03FT062.eop-EUR03.prod.protection.outlook.com (2603:10a6:203:3d:cafe::f4) by AM5PR0201CA0014.outlook.office365.com (2603:10a6:203:3d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.20 via Frontend Transport; Fri, 24 Jul 2020 15:48:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT062.mail.protection.outlook.com (10.152.17.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3216.10 via Frontend Transport; Fri, 24 Jul 2020 15:48:33 +0000 X-Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1415.2; Fri, 24 Jul 2020 15:48:32 +0000 X-Received: from blr-smtp0.blr.arm.com (10.162.80.49) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.1415.2 via Frontend Transport; Fri, 24 Jul 2020 15:48:32 +0000 X-Received: from E119881.Arm.com (E119881.Arm.com [10.1.197.28]) by blr-smtp0.blr.arm.com (Postfix) with ESMTP id 055B17F9C1; Fri, 24 Jul 2020 21:18:02 +0530 (IST) From: "PierreGondois" To: CC: Pierre Gondois , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v1 2/2] Platform/ARM/VExpressPkg: Merge ASL and CfgMngr directories Date: Fri, 24 Jul 2020 16:47:58 +0100 Message-ID: <20200724154758.333404-3-pierre.gondois@arm.com> In-Reply-To: <20200724154758.333404-1-pierre.gondois@arm.com> References: <20200724154758.333404-1-pierre.gondois@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ccbd6c8-7e24-475d-180d-08d82fe90a0a X-MS-TrafficTypeDiagnostic: VI1PR08MB4000:|DB7PR08MB3609: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:10000;OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 0fcD4YlId3vEatP5FVFXoLjhA7YKVYYpzIuxyKEo8JrR3bw1JRLZBZxiUfKayyDDPr9CbnN92892mf21vrNYr9/jMMFV9kKyBiZzuQWPuoLmuARbrrxmGBq8zXxXCx+X22/U842hTWyVOrc2wq5Asc6RhQDmZLvJC23+TsIve5osKryZCh/ESPJU6bzvV/UXXoRno5dFG4X/ETVrwmEhaXLYztwl79TKDy1t7nZkIj2zqS9QtGnnVv36BEjqKaG1P7Cd4gP5O/gbbrs7BjxnqKuOWG/Kk9GdiWku/bxDQrxfrpDRghjp5kXsFAKhwq5NX6aeaEVzUPp4TOK8CxMDo34xiq2ZNYARbX/uVYECsYKBrSxEuzRUBQMcbtAPLlvZTPpL2Z+BWn7mdGI9C/oLhneP7mIKyUryZ5CUOPi4osCeJB3dJuzsmvzeK1jxhhhmMX/ym9zOlEBplRK3tOwK+GE+wvuz1jrx9S6Gd+Hmms93DmEZMJIgVSv1VeqDYds1GRwa8QfzmCTUE6lyBVH2Xg== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFTY:;SFS:(4636009)(376002)(346002)(136003)(396003)(39860400002)(46966005)(4326008)(2616005)(1076003)(6266002)(8676002)(8936002)(86362001)(47076004)(966005)(6666004)(478600001)(426003)(36756003)(186003)(336012)(82740400003)(7696005)(82310400002)(356005)(54906003)(81166007)(6916009)(70586007)(83380400001)(5660300002)(70206006)(316002)(26005)(2906002)(40753002)(133343001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4000 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT048.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 37cddc46-bf39-4523-7024-08d82fe9054e X-Microsoft-Antispam-Message-Info: roIsYT8iuCFgLnVtw2/FUhvgRL+Nd5aYlH6qjQA/dgqxHIWkeYh2Jg8pJU3gNepjFj/y+co/7rhPsNQ1vCecQ7Lk6/6mLIc5ka4CQf4Ng3dRjmoYJDGROV6IOmxxudLhEDttzFAG3Ttg13NXlJEU/GK/aGaK3RjJGytU5BvcdNWxFSLm5ZdyZAPVAI5uuy9UT4GgSqH08n9NCshvxNLYAxDb49Mw8hV57m5HSLbbv23YHTB8Tf0Iuddsafto0e537bjs4RxAF/FZ0EIG73wWkwMwhbnu0AgZFEnR0/NdbEwLyGZywzjmf52naxN5XZ5QjcclU2FQwFEEUuXQMbx3ou3HmAoPMDEBNHnj+NOSkcxweABku6IcLXhwO4wVzP8zmyHtoao5PpzTv+URlY1S1Dorun4IQny9FSN1bbHPw4aS6fR6SB0oXeZ/+Wb8yUFUMSGD65MLLdb39gprNnGY9af4L5XRb3GFt3FW21gwGiHUG1KPA43LtpXizCXuI4vB/1/rr9E48fwyM2Eu4EXTlw== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2020 15:48:41.5164 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ccbd6c8-7e24-475d-180d-08d82fe90a0a X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT048.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3609 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com X-Gm-Message-State: QxK0nRwwH0jwxUsLeBmEv7CTx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1595605727; bh=qAME7MV2FsiFa7K32wTS33ZHE6GDa5F/YfAnHm0oJQ0=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=sBOHr+i7M1og4o8fq4qDZe0NAh+LJyWXVaX6UIibPl/kDaA3H0aXBcL1CX/XW5IxUAz GDvAavxKFjeBsMfL/ChYTtCwXHaCjdmcNELpO6A8q2jbiTnxzbClTWFSaQEAeu1RF4yAv iIfMwFHI+yfdqZfa6UKAghaiP6KPevHOtw4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pierre Gondois Due to the following patch available in edk2: 0a4aa20e8d446c2f5dd54f3a0a7ec4d52f0ebdb6 BaseTools: Compile AML bytecode arrays into .obj file a C array containing the AML bytecode is generated from ASL files, and a .obj file containing this array is generated. The Configuration Manager is currently providing an extra flag to the ASL compiler to generate a C array containing AML bytecode. This C array is contained in a .hex file. This .hex file is included where necessary. This mechanism was necessary due to the impossibility to describe dependencies between ASL files and C files. This mechanism is not required anymore. Thus the ASL and CfgMngr directories can me merged in one module. This patch merge the two directories for the FVP. Signed-off-by: Pierre Gondois --- The changes can be seen at: https://github.com/PierreARM/edk2-platforms/com= mits/847_Merge_ASL_and_CfgMngr_dir_v1 Notes: v1: - Merge the PlatformASLTablesLib and ConfigurationManagerDxe directories. [Pierre] Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc= | 10 ++----- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManagerDxe.inf | 4 +-- Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Platfor= mASLTablesLib.inf | 29 -------------------- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.h | 8 +++++- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.c | 5 +--- Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib =3D> C= onfigurationManagerDxe/AslTables}/Dsdt.asl | 0 6 files changed, 12 insertions(+), 44 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= ager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationM= anager.dsc.inc index 9b044bba5d907d1a53eb73c1c912968f7ee321da..0915c154cce6b0686f67a383dc6= 9231ed3ed6f36 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.ds= c.inc +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.ds= c.inc @@ -1,7 +1,7 @@ ## @file # dsc include file for Configuration Manager # -# Copyright (c) 2017 - 2018, ARM Limited. All rights reserved. +# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -16,10 +16,4 @@ [LibraryClasses.common] =20 [Components.common] # Configuration Manager - Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Co= nfigurationManagerDxe.inf { - - # Platform ASL Tables - PlatformAslTablesLib|Platform/ARM/VExpressPkg/ConfigurationManager/Pla= tformASLTablesLib/PlatformASLTablesLib.inf - - *_*_*_PLATFORM_FLAGS =3D -I$(BIN_DIR)/Platform/ARM/VExpressPkg/Configur= ationManager/PlatformASLTablesLib/PlatformASLTablesLib/OUTPUT - } + Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Co= nfigurationManagerDxe.inf diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/Configuratio= nManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index 14f4323f0015a7b0950ee7b3316f03c8c9c4fb9b..c17595b7ec37cdd1c99b258cd32= d1bde6c76a5ed 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManagerDxe.inf +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManagerDxe.inf @@ -1,7 +1,7 @@ ## @file # Configuration Manager Dxe # -# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. +# Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -22,6 +22,7 @@ [Defines] =20 [Sources] ConfigurationManager.c + AslTables/Dsdt.asl =20 [Packages] ArmPkg/ArmPkg.dec @@ -33,7 +34,6 @@ [Packages] =20 [LibraryClasses] ArmPlatformLib - PlatformAslTablesLib PrintLib UefiBootServicesTableLib UefiDriverEntryPoint diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTable= sLib/PlatformASLTablesLib.inf b/Platform/ARM/VExpressPkg/ConfigurationManag= er/PlatformASLTablesLib/PlatformASLTablesLib.inf deleted file mode 100644 index 23a71c365b7387a91353e2492bc7a19e03ffb9a0..000000000000000000000000000= 0000000000000 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Pl= atformASLTablesLib.inf +++ /dev/null @@ -1,29 +0,0 @@ -## @file -# Platform ASL Tables -# -# Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. -# -# SPDX-License-Identifier: BSD-2-Clause-Patent -## - -[Defines] - INF_VERSION =3D 0x0001001B - BASE_NAME =3D PlatformAslTablesLib - FILE_GUID =3D 4000AEAB-C6D3-4F67-ADE3-D4B504FC164B - MODULE_TYPE =3D DXE_DRIVER - VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D PlatformAslTablesLib|DXE_DRIVER - -# -# The following information is for reference only and not required by the = build tools. -# -# VALID_ARCHITECTURES =3D ARM AARCH64 -# - -[Sources] - Dsdt.asl - -[Packages] - ArmPlatformPkg/ArmPlatformPkg.dec - MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.h index c61750dc55cd260ca7c1a4720c354cb7dfed1c0c..6fb959ab7ae2c77f750781d0566= 0957488fae8cd 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.h @@ -1,6 +1,6 @@ /** @file =20 - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -12,6 +12,12 @@ #ifndef CONFIGURATION_MANAGER_H__ #define CONFIGURATION_MANAGER_H__ =20 +/** C array containing the compiled AML template. + This symbol is defined in the auto generated C file + containing the AML bytecode array. +*/ +extern CHAR8 dsdt_aml_code[]; + /** The configuration manager version. */ #define CONFIGURATION_MANAGER_REVISION CREATE_REVISION (1, 0) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationMan= agerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationMana= ger/ConfigurationManagerDxe/ConfigurationManager.c index 010702ae1daee515d079273975920c8af5c0bf41..a48eb0285c60177078324bdbcd8= fa29c308e6a13 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c +++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe= /ConfigurationManager.c @@ -1,7 +1,7 @@ /** @file Configuration Manager Dxe =20 - Copyright (c) 2017 - 2019, ARM Limited. All rights reserved. + Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.
=20 SPDX-License-Identifier: BSD-2-Clause-Patent =20 @@ -24,9 +24,6 @@ #include "ConfigurationManager.h" #include "Platform.h" =20 -// AML Code Include files generated by iASL Compiler -#include - /** The platform configuration repository information. */ STATIC diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTable= sLib/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/Configuration= ManagerDxe/AslTables/Dsdt.asl similarity index 100% rename from Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTables= Lib/Dsdt.asl rename to Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManage= rDxe/AslTables/Dsdt.asl --=20 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)' -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#63245): https://edk2.groups.io/g/devel/message/63245 Mute This Topic: https://groups.io/mt/75768725/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-