From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=7NqFBOuL; spf=pass (domain: arm.com, ip: 40.107.13.51, 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=STr/riet0cmfpF8ZLGXrgYooUfvSHDXBjnp/1gEzFR4=; b=7NqFBOuLhfD6PH4zKwQR+wK8VWzjHqylRojnlM/V4O+WDC34M2nEl/15J18rJNlmfh8f7UjxMlu+OVhZ3fjconov0oreouRTOVhJ2h+0kEAIjqUanwPdWtsldUoqWDFPAziBduOBymCOZPa4bgL02UUYtH9A+BI1EzgKTMWZjlU= 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 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 (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 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 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 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 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 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=STr/riet0cmfpF8ZLGXrgYooUfvSHDXBjnp/1gEzFR4=; b=7NqFBOuLhfD6PH4zKwQR+wK8VWzjHqylRojnlM/V4O+WDC34M2nEl/15J18rJNlmfh8f7UjxMlu+OVhZ3fjconov0oreouRTOVhJ2h+0kEAIjqUanwPdWtsldUoqWDFPAziBduOBymCOZPa4bgL02UUYtH9A+BI1EzgKTMWZjlU= 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 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; 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 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 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 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: [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> 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: 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 Return-Path: Pierre.Gondois@arm.com 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: BCL:0; X-Microsoft-Antispam-Message-Info: roIsYT8iuCFgLnVtw2/FUhvgRL+Nd5aYlH6qjQA/dgqxHIWkeYh2Jg8pJU3gNepjFj/y+co/7rhPsNQ1vCecQ7Lk6/6mLIc5ka4CQf4Ng3dRjmoYJDGROV6IOmxxudLhEDttzFAG3Ttg13NXlJEU/GK/aGaK3RjJGytU5BvcdNWxFSLm5ZdyZAPVAI5uuy9UT4GgSqH08n9NCshvxNLYAxDb49Mw8hV57m5HSLbbv23YHTB8Tf0Iuddsafto0e537bjs4RxAF/FZ0EIG73wWkwMwhbnu0AgZFEnR0/NdbEwLyGZywzjmf52naxN5XZ5QjcclU2FQwFEEUuXQMbx3ou3HmAoPMDEBNHnj+NOSkcxweABku6IcLXhwO4wVzP8zmyHtoao5PpzTv+URlY1S1Dorun4IQny9FSN1bbHPw4aS6fR6SB0oXeZ/+Wb8yUFUMSGD65MLLdb39gprNnGY9af4L5XRb3GFt3FW21gwGiHUG1KPA43LtpXizCXuI4vB/1/rr9E48fwyM2Eu4EXTlw== 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)(376002)(346002)(396003)(39860400002)(136003)(46966005)(426003)(8936002)(6666004)(6266002)(336012)(70206006)(70586007)(86362001)(47076004)(478600001)(81166007)(82740400003)(316002)(966005)(36756003)(6916009)(8676002)(82310400002)(4326008)(2616005)(186003)(1076003)(26005)(83380400001)(7696005)(2906002)(54906003)(5660300002)(40753002)(133343001);DIR:OUT;SFP:1101; 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 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 FVP. 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/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc | 10 ++----- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf | 4 +-- Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf | 29 -------------------- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h | 8 +++++- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 5 +--- Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib => ConfigurationManagerDxe/AslTables}/Dsdt.asl | 0 6 files changed, 12 insertions(+), 44 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc index 9b044bba5d907d1a53eb73c1c912968f7ee321da..0915c154cce6b0686f67a383dc69231ed3ed6f36 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc +++ b/Platform/ARM/VExpressPkg/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 ## @@ -16,10 +16,4 @@ [LibraryClasses.common] [Components.common] # Configuration Manager - Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf { - - # Platform ASL Tables - PlatformAslTablesLib|Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf - - *_*_*_PLATFORM_FLAGS = -I$(BIN_DIR)/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib/OUTPUT - } + Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf index 14f4323f0015a7b0950ee7b3316f03c8c9c4fb9b..c17595b7ec37cdd1c99b258cd32d1bde6c76a5ed 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] [Sources] ConfigurationManager.c + AslTables/Dsdt.asl [Packages] ArmPkg/ArmPkg.dec @@ -33,7 +34,6 @@ [Packages] [LibraryClasses] ArmPlatformLib - PlatformAslTablesLib PrintLib UefiBootServicesTableLib UefiDriverEntryPoint diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf b/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.inf deleted file mode 100644 index 23a71c365b7387a91353e2492bc7a19e03ffb9a0..0000000000000000000000000000000000000000 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASLTablesLib.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 = 0x0001001B - BASE_NAME = PlatformAslTablesLib - FILE_GUID = 4000AEAB-C6D3-4F67-ADE3-D4B504FC164B - 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 - -[Packages] - ArmPlatformPkg/ArmPlatformPkg.dec - MdePkg/MdePkg.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index c61750dc55cd260ca7c1a4720c354cb7dfed1c0c..6fb959ab7ae2c77f750781d05660957488fae8cd 100644 --- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/VExpressPkg/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,12 @@ #ifndef CONFIGURATION_MANAGER_H__ #define CONFIGURATION_MANAGER_H__ +/** 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/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index 010702ae1daee515d079273975920c8af5c0bf41..a48eb0285c60177078324bdbcd8fa29c308e6a13 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 - 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 @@ -24,9 +24,6 @@ #include "ConfigurationManager.h" #include "Platform.h" -// AML Code Include files generated by iASL Compiler -#include - /** The platform configuration repository information. */ STATIC diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/Dsdt.asl similarity index 100% rename from Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Dsdt.asl rename to Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/Dsdt.asl -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'