From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=TsNqbet0; spf=pass (domain: arm.com, ip: 40.107.0.75, mailfrom: pierre.gondois@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MlIefUw3zn0xjcdwcQ9X01vqtdsHiSAsg8MoLXT9+vI=; b=TsNqbet0sGlNO4XHmfhOPSVbGn/qHmlped5FekZA1u/z+Zqvqlmi7heDuNLsULiHomlcBcxwp3Xmy4gse5wCVR0PDWwQ6xm/PeC1EJR75xG03Z/YywPgD8tVC2wgiqMsZfm8DnzCpKt+ys7ZnIqKM4K6W5zm9FJC+oep+7bFjmk= 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 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 (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; 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 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 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 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MlIefUw3zn0xjcdwcQ9X01vqtdsHiSAsg8MoLXT9+vI=; b=TsNqbet0sGlNO4XHmfhOPSVbGn/qHmlped5FekZA1u/z+Zqvqlmi7heDuNLsULiHomlcBcxwp3Xmy4gse5wCVR0PDWwQ6xm/PeC1EJR75xG03Z/YywPgD8tVC2wgiqMsZfm8DnzCpKt+ys7ZnIqKM4K6W5zm9FJC+oep+7bFjmk= 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 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; 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 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 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 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 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: [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> X-Mailer: git-send-email 2.16.2.windows.1 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 Return-Path: Pierre.Gondois@arm.com 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: BCL:0; X-Microsoft-Antispam-Message-Info: 1ukfzfkEMKeemGyauNwR2Tnug5OcQnODYPaIKPYmSla/9kkbFwexerMSj8DKf9nHoUVaUwioClwtvgjPc7yEwOUKuTviKDpSi3q9Rkft4ONAigsG4EMvjVyJQZmeQH62ynXYAKZ97OtVSzIEPyG1UxTWrvxmTxAs3HOa+cmfpop+FNfax6tl+YIeSKf62aOUJaPw8G+lHa7+o2Ey7fuMfTEzX1vVBZP8rXXYn7lZmYSIxqCdu0vKr+Brpa9jDOkTxT0COM6hvdWF3B5PS9aWYkclI6uwFRIL96ZTa2hajXaoPHdLMavr7KTnB2Uy6X220SGRby5B7rxA0wrrr1WCaqEIFI6ehRdrr6r9Hg8QvL9HFBUUUB9VWLZxJxmt5Jsl/rFp4xkgUytJ2sPqY8+v4KiGyQfn6enOp0oZof2cgE3jVUuvpmrYsSzBj8eMRQOf7mRbmSR2Jf8vSJ1Crzti6GJcszO/zAvCReWdZGfjSQAztAY3KGUjAdSbowfLRtp2rZi6tN3jZHeAzCes7E/zcw== X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFTY:;SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(46966005)(70206006)(70586007)(6666004)(2906002)(7696005)(8936002)(186003)(8676002)(1076003)(54906003)(86362001)(26005)(36906005)(316002)(6266002)(336012)(478600001)(5660300002)(19627235002)(6916009)(4326008)(83380400001)(36756003)(966005)(426003)(82740400003)(2616005)(82310400002)(47076004)(81166007)(40753002)(133343001);DIR:OUT;SFP:1101; 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 Content-Type: text/plain 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/commits/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/ConfigurationManagerDxe.inf | 7 +++- Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf | 39 -------------------- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h | 11 +++++- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 8 +--- Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl | 0 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtJunoUsb.asl | 0 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/SsdtPci.asl | 0 Platform/ARM/JunoPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/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.dsc.inc index 6699a016098623f9c8f567a8fa305b7cbf0b4fff..987c2d8ca3ba9757e36b9e16171a280523107a7a 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] [Components.common] # Configuration Manager - Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf { - - # Platform ASL Tables - PlatformAslTablesLib|Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf - - *_*_*_PLATFORM_FLAGS = -I$(BIN_DIR)/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib/OUTPUT - } + Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index dd71f815db672f25f04713460acb2460bdc45699..a3e7db12f8c913f7111b5ff4ad724a5bdcc35956 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf +++ b/Platform/ARM/JunoPkg/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,10 @@ [Defines] [Sources] ConfigurationManager.c + AslTables/Dsdt.asl + AslTables/SsdtJunoUsb.asl + AslTables/SsdtPci.asl + AslTables/SsdtUart.asl [Packages] ArmPkg/ArmPkg.dec @@ -33,7 +37,6 @@ [Packages] [LibraryClasses] ArmPlatformLib - PlatformAslTablesLib PrintLib UefiBootServicesTableLib UefiDriverEntryPoint diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf deleted file mode 100644 index 93978cff97d9704f8639732c55d01bf559a5a2d6..0000000000000000000000000000000000000000 --- a/Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.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 = 0x0001001B - BASE_NAME = JunoAslTablesLib - FILE_GUID = 557004DB-DF45-426B-9E5E-1E8ABAA2EE2C - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - LIBRARY_CLASS = PlatformAslTablesLib|DXE_DRIVER - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = 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/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index 7fdf663fc6d2ad80da26ff1f1635c858d5be4e93..2073ae4902e540de869612353bfaf0ebacaea50d 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -1,6 +1,6 @@ /** @file - 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 @@ -12,6 +12,15 @@ #ifndef CONFIGURATION_MANAGER_H__ #define CONFIGURATION_MANAGER_H__ +/** 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/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index d52cc2982334ded1c3bf2f5e8f570378d8fb0ae1..913cffc9b994319065b5292b0d28970a0a0d8320 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -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 @@ -25,12 +25,6 @@ #include "ConfigurationManager.h" #include "Platform.h" -// 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/ConfigurationManagerDxe/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/ConfigurationManagerDxe/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/ConfigurationManagerDxe/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/ConfigurationManagerDxe/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 -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'