From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.69]) by mx.groups.io with SMTP id smtpd.web12.2069.1604742347132097108 for ; Sat, 07 Nov 2020 01:45:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=zxlUlznJ; spf=pass (domain: arm.com, ip: 40.107.6.69, mailfrom: sami.mujawar@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=kY7q2RTQKpkdWZ6NORLPYT2CoNFr4Ug8bhCDq0WkHRY=; b=zxlUlznJkm90sioMTKlms4QMtd9sucsNXHSKrL0z2E2kX3QhNQ3ANMWh1qkatQcpZhFU8V+9HaMWr45tnmJzivaX5qzCbiVdn0YraA0GjTDn4LMbmef38cJzghxFwb8Nk3XNju1SOZAX6NH/Y38ev2/Bxri5doxgbqnQMs0DJCc= Received: from AM6PR10CA0060.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::37) by DB7PR08MB3273.eurprd08.prod.outlook.com (2603:10a6:5:28::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Sat, 7 Nov 2020 09:45:44 +0000 Received: from AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:80:cafe::ae) by AM6PR10CA0060.outlook.office365.com (2603:10a6:209:80::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Sat, 7 Nov 2020 09:45:44 +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=pass 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 AM5EUR03FT015.mail.protection.outlook.com (10.152.16.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.17 via Frontend Transport; Sat, 7 Nov 2020 09:45:44 +0000 Received: ("Tessian outbound 13ed5f5344c0:v71"); Sat, 07 Nov 2020 09:45:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ac99d0916eb3895e X-CR-MTA-TID: 64aa7808 Received: from 02767dd952b0.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4A0E17AB-FA13-415F-8757-9096736E9F44.1; Sat, 07 Nov 2020 09:45:38 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 02767dd952b0.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Sat, 07 Nov 2020 09:45:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CBYKqa8GA/9iCP6xt6nu/LNlXyaCTwg8Eucigglb0X5GsDq0Nxlr7kyUvcfYjJrAx1vfjtznRhvZT3Xi8/uxMoNpUkjy3MjOsja3U7+Yk7B0ESqf5OIMhkhZl/X9xf2SkpHavPNqqoTa84aa7Jy0lguOlFs7p7pXSop3ksblAIBpfcD8ibtNJ1Gs6JIGY5dm4MprjlvWZoJfak0kUn4V7sSg/pE0zbN0WXBhnSncvqn1bwyKS+BpdW4AS0ap/vVZYxpoU5Jy35uaRd9ZneeHy7cF56+6qWcq/drHUjQTJTXkYZwx3c+4d9BwFq+IOL/xAjikrAaSD5/Jz4CGjJysDA== 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=kY7q2RTQKpkdWZ6NORLPYT2CoNFr4Ug8bhCDq0WkHRY=; b=MFC8Eu67uAdejoFbgQXG/L3dV+EO16bXn134pzf6NUmP/Vd2kTc5+vEQvV0qc/2t8HdeOoMLOknlVaUXRPNB6jrN1k5b473Qs+gaTyKmNypmzx93vdaJqP41kf0id3y0FzXpWZYuGonN0C6ffi2yUUorvtQNAIfvlU232RLg/bUA7qe9tamYYaVAO73ljKvOFspVdYVOuEd9LG+PpbC6XXT7B8jcLTv6sBpcBRxROkKQI35vk4qG1ylU6NP5xEiZQNcqqUYqk+kkZhEULr/T87ZG6o2glEhkl+T7WiExMFZQ6FWSa9deVaR+92KLj/tQ1N74o5Ml1Xr5alZg/zWE6A== 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=pass (p=none sp=none pct=100) 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=kY7q2RTQKpkdWZ6NORLPYT2CoNFr4Ug8bhCDq0WkHRY=; b=zxlUlznJkm90sioMTKlms4QMtd9sucsNXHSKrL0z2E2kX3QhNQ3ANMWh1qkatQcpZhFU8V+9HaMWr45tnmJzivaX5qzCbiVdn0YraA0GjTDn4LMbmef38cJzghxFwb8Nk3XNju1SOZAX6NH/Y38ev2/Bxri5doxgbqnQMs0DJCc= Received: from AM5PR04CA0034.eurprd04.prod.outlook.com (2603:10a6:206:1::47) by PR3PR08MB5658.eurprd08.prod.outlook.com (2603:10a6:102:88::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.27; Sat, 7 Nov 2020 09:45:37 +0000 Received: from AM5EUR03FT009.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:1:cafe::9) by AM5PR04CA0034.outlook.office365.com (2603:10a6:206:1::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Sat, 7 Nov 2020 09:45:37 +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=pass 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 AM5EUR03FT009.mail.protection.outlook.com (10.152.16.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3541.17 via Frontend Transport; Sat, 7 Nov 2020 09:45:36 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Sat, 7 Nov 2020 09:45:35 +0000 Received: from E107187.Arm.com (10.57.57.9) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Sat, 7 Nov 2020 09:45:34 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [PATCH edk2-platforms v2 1/3] Platform/ARM/Juno: Merge ASL and CfgMngr directories Date: Sat, 7 Nov 2020 09:45:30 +0000 Message-ID: <20201107094532.42888-2-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20201107094532.42888-1-sami.mujawar@arm.com> References: <20201107094532.42888-1-sami.mujawar@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: 4d42049c-c682-458f-cd0f-08d88301e5a8 X-MS-TrafficTypeDiagnostic: PR3PR08MB5658:|DB7PR08MB3273: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: QnwuYbULGJGEiUU/jdBF4K1wh4xTOpnex/DxYsEYoyinN30ce/9Qur7yfAImVu/ggr35jVYKv2D3P0O/HGWb+vW7xTpnUMSt/Lw6UR1QMzT2C5VeOPZ1PtX1HbirDNJ9k+0gToFAqa0Am7c8xIISCeACZS3COSzZHIv7Ia1LVJUeIuob5iqApTo33pjKjT5vDw7WnKTE6mOgsq3fnBc9DRv8P9g37ku9iwbBbAOK9wxE2xvHrGnRF0arkgL7s/NZQszONUIDmmr7hOf+zTWnMLDOHQfqvGQXPnuPKzKOeTYloiTvD61CcDA/GscFZ62XRyg1TO15RoR444vUryqqK5XDm8cWtKEFt/TSfuLfI9hMqsaTbJO1ALZmJNXIyjtNcut9w14Vfk7Pu3bjZhtdu0T0rdyviOD6SRKIxJV8Zm2bBD0X5MeqHpqWzry/0KS1RMCTE5OOCpM+b9qIDBKviF8T7agi0MpKD/REEQLuWSklbWa0ktD1eyXrMImA+tsW+vCV0HvFMxv5aMEnaQkU5Q== 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;SFS:(4636009)(346002)(136003)(39860400002)(396003)(376002)(46966005)(36756003)(6666004)(7696005)(83380400001)(44832011)(316002)(70586007)(19627235002)(2906002)(4326008)(81166007)(8676002)(5660300002)(8936002)(186003)(426003)(966005)(54906003)(26005)(1076003)(356005)(336012)(478600001)(70206006)(82740400003)(2616005)(82310400003)(47076004)(86362001)(6916009)(40753002)(133343001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5658 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: cfa44bd6-b330-4f0b-2aef-08d88301e11f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B5ZAfW7vqlzq94mG7XSihK2bY40AfMcuJxSvf7vuA28PKAhg7PvrJb2lPT/bhjnV3vHyh7NAE646pBQgGoAhLfKsRLCXx1Td426rPfXoSs52vv2N86PvRiOdvCVmhqOZBWQjKVFz++Taeuj6KCljHp7TKc/uOgSxHKcqjZxQQMusbIn8aEFR3r8OVJ0oRLkTvHMxJ8mqhUCLDGU88D1hd4eqGYnTTbbik+93TEXkBZwwHXc4HrsKnoALK9zCAGHWzZzC7ZtORL7DJLxlveWGyTOxwG+75h8b9fn6W3QTUrzOc/c9okO6bKeAOP3pE/TPoHn5UNRxJTdn6IEwOfLRnnXZybJVE2nFeKp4xJfVttlBTv0bgCL1G/Ot7QwKO5aydsnSeTFIYAza/ZEl0R1BWCViexoo7l+tEvlxCAT+uiUfLaA/kzUvfcBjfhJL3guhfHCJDsIZroDXbEZwYpQ0eNuJGkzU5C6mxatlth/o/Ces65JE+DxzqIuYx7WMyfLg7vqvwBcKO8eYismZ2Lzfig== 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;SFS:(4636009)(376002)(396003)(346002)(39860400002)(136003)(46966005)(426003)(44832011)(36756003)(186003)(26005)(47076004)(83380400001)(1076003)(82310400003)(336012)(4326008)(2616005)(86362001)(54906003)(7696005)(70206006)(8676002)(82740400003)(70586007)(478600001)(36906005)(2906002)(966005)(19627235002)(6916009)(6666004)(8936002)(5660300002)(81166007)(316002)(40753002)(133343001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2020 09:45:44.3436 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4d42049c-c682-458f-cd0f-08d88301e5a8 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: AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3273 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 Signed-off-by: Sami Mujawar --- Notes: v2: - No code change. Resending with v2 series. [SAMI] Ref: https://edk2.groups.io/g/devel/message/63247 v1: - Merge the PlatformASLTablesLib and ConfigurationManagerDxe [Pierre] directories. Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc | 10 +---- 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 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 8 +--- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h | 11 +++++- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf | 7 +++- Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf | 39 -------------------- 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/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 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/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/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 -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'