From nobody Mon Apr 29 14:11:24 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.108 as permitted sender) smtp.mailfrom=bounce+27952+67120+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 160474234874382.77851110055792; Sat, 7 Nov 2020 01:45:48 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id s1OKYY1788612xPKgS8TfQMU; Sat, 07 Nov 2020 01:45:48 -0800 X-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 X-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 X-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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67120+1787277+3901457@groups.io; helo=mail02.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 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 X-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 X-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 X-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 X-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 X-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; X-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 X-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 X-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: [edk2-devel] [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> 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 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-Message-Info: B5ZAfW7vqlzq94mG7XSihK2bY40AfMcuJxSvf7vuA28PKAhg7PvrJb2lPT/bhjnV3vHyh7NAE646pBQgGoAhLfKsRLCXx1Td426rPfXoSs52vv2N86PvRiOdvCVmhqOZBWQjKVFz++Taeuj6KCljHp7TKc/uOgSxHKcqjZxQQMusbIn8aEFR3r8OVJ0oRLkTvHMxJ8mqhUCLDGU88D1hd4eqGYnTTbbik+93TEXkBZwwHXc4HrsKnoALK9zCAGHWzZzC7ZtORL7DJLxlveWGyTOxwG+75h8b9fn6W3QTUrzOc/c9okO6bKeAOP3pE/TPoHn5UNRxJTdn6IEwOfLRnnXZybJVE2nFeKp4xJfVttlBTv0bgCL1G/Ot7QwKO5aydsnSeTFIYAza/ZEl0R1BWCViexoo7l+tEvlxCAT+uiUfLaA/kzUvfcBjfhJL3guhfHCJDsIZroDXbEZwYpQ0eNuJGkzU5C6mxatlth/o/Ces65JE+DxzqIuYx7WMyfLg7vqvwBcKO8eYismZ2Lzfig== 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 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,sami.mujawar@arm.com X-Gm-Message-State: FtZMrlMUUdioxCCY9yJAuvFqx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604742348; bh=ufheQgHTg3j/KuO3g3+elTLHXi7CnmW5MaC8Ne6mR2k=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ox0dnngJFfELFmERUBt9bJmC06mUIQsVQZrld63bRUaD07czx2pZZs7QKAUXm0NuegO w9BIr/PxYQaP71AABVK3t6+jXjrojqF2LTZjLTNLo82rHH8pBUkj2SdRWVZK63UCj7MqG bHWUWrxJekKWDWkMMo9KOIilvbzTHworUII= 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 Signed-off-by: Sami Mujawar --- Notes: v2: - No code change. Resending with v2 series. [SAMI] Ref: https://edk2.groups.io/g/devel/message/63247 =20 v1: - Merge the PlatformASLTablesLib and ConfigurationManagerDxe [Pierre] directories. Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManager.dsc.inc = | 10 +---- 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 Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.c | 8 +--- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManager.h | 11 +++++- Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/Configur= ationManagerDxe.inf | 7 +++- Platform/ARM/JunoPkg/ConfigurationManager/PlatformASLTablesLib/PlatformASL= TablesLib.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.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/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 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/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/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 --=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 (#67120): https://edk2.groups.io/g/devel/message/67120 Mute This Topic: https://groups.io/mt/78092586/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 Mon Apr 29 14:11:24 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.108 as permitted sender) smtp.mailfrom=bounce+27952+67121+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604742350505357.0194046392073; Sat, 7 Nov 2020 01:45:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id bCU2YY1788612x0qoOw36Hz5; Sat, 07 Nov 2020 01:45:50 -0800 X-Received: from EUR03-VE1-obe.outbound.protection.outlook.com (EUR03-VE1-obe.outbound.protection.outlook.com [40.107.5.41]) by mx.groups.io with SMTP id smtpd.web09.1962.1604742349001476743 for ; Sat, 07 Nov 2020 01:45:49 -0800 X-Received: from AM5PR0601CA0068.eurprd06.prod.outlook.com (2603:10a6:206::33) by VE1PR08MB5758.eurprd08.prod.outlook.com (2603:10a6:800:1a0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Sat, 7 Nov 2020 09:45:45 +0000 X-Received: from VE1EUR03FT016.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:0:cafe::b1) by AM5PR0601CA0068.outlook.office365.com (2603:10a6:206::33) 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:45 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67121+1787277+3901457@groups.io; helo=mail02.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 VE1EUR03FT016.mail.protection.outlook.com (10.152.18.115) 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:45 +0000 X-Received: ("Tessian outbound 814be617737e:v71"); Sat, 07 Nov 2020 09:45:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 56d0be53dd7a176a X-CR-MTA-TID: 64aa7808 X-Received: from 347ce95d5343.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 8B20A790-B3B4-45A4-A460-F3A4EC2C282B.1; Sat, 07 Nov 2020 09:45:39 +0000 X-Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 347ce95d5343.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Sat, 07 Nov 2020 09:45:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lnqNr8bJdwhfXXdOTBu5rZdZ6COJ2IJWQ83u8pgmFubPwx1sz+eDo4vhYOIW300cAq5ZH88LHjIPS5SoLT6Tf+BkfkVBNZ7REr4jdNpc93EO8xRIMe04DINZUzfJPBKhl5hYa56b5L57Oa3nepQ63xDkvSUaBKzolpctsMl/LDgdK7f6LVGRIEtT93DrKQMuERKJOTpo2OvDd9SmfwchqDKaubuHt4dNznZxB9izyIlCWfYhdQIRz53i4X+iT/2YMeNuYK01fQmzXp4tnYJI8R5TDLdmXGbu6Tea7bMHl24cF5W6gWdexUq6yiuGiFHRY5ux/yqRV6cJCOQDS1jQqA== 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=HGEBLd1BLxNNHMbjhpIPxPf4sHOdy+25UVJqi5cbNZQ=; b=A5g/bEqdS1H2ipt3d1zf8PpRVo+8EJj6iudnqI6O0fqczo85ab4kFw/B+pHISeOrVDolhPhYQW6YUbwubEG7XlDR4Og6qjAQbMzMdYvff5bB5EDNsxCkC2fP7NS8ttlyUJiL6qNAZkt5vuurPlm4eyMUjobU2ps0uHyKwmG5bLpLM8G7nWwOzLKjNEebiTfstn5YtWmh1vrkydDlj27QpbY/PbiJRabewXVIrMOhgSVIyuGmVlCzBABUYiMUVyMyzI122YzTnWLGodu/0ZnT2+sho8lASuLB0JofrBpHCA7YTXoOlCbkK2bzqDfTT/XmeDZV7KTccm1tyTCMRt0tOg== 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 X-Received: from AM6P192CA0074.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::15) by AM8PR08MB5842.eurprd08.prod.outlook.com (2603:10a6:20b:1d7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Sat, 7 Nov 2020 09:45:37 +0000 X-Received: from AM5EUR03FT020.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8d:cafe::90) by AM6P192CA0074.outlook.office365.com (2603:10a6:209:8d::15) 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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT020.mail.protection.outlook.com (10.152.16.116) 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:37 +0000 X-Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2044.4; Sat, 7 Nov 2020 09:45:37 +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; Sat, 7 Nov 2020 09:45:36 +0000 X-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:35 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v2 2/3] Platform/ARM/VExpressPkg: Merge ASL and CfgMngr directories Date: Sat, 7 Nov 2020 09:45:31 +0000 Message-ID: <20201107094532.42888-3-sami.mujawar@arm.com> 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: 98f25222-1dba-4875-362e-08d88301e61e X-MS-TrafficTypeDiagnostic: AM8PR08MB5842:|VE1PR08MB5758: 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: 1/+K1NiOgPvwziEcabVYxDNSNNTN6D6Z14DNNQdQ2rZ1ISzIAx6s72f0lw9VE9khd9gLR8XZC+v6ZHMqGX41Lmegnane73y85BCATCwirK1oHHinE5h9Gw6I+nqeJF0RZYHrMt+6rUV8/P6+9dtE4SKIEHZ4+F2+OhXAUoJ15vqhHKdaVvZAQzIw5LNIYQVfiohgTYT+nLK3/86n9/ejvkVx6maTC7+Apu9LLOoWo9hPvKYQS3NUzyb9R56yHW/eANis4gy4Lu1EDy3MIxOWiwEeObr756h8gGMic26d0+QnBQt1HtN1kjK8vqENTus9Vwn/jDqQAYUGDQ6rsfd1UwkN8o+Fv/dC655Ixz/rBfHjbqy7Lu05XiXiYFeNwk4KQaBvv75rqox8dNGbArQFlhaEM8buXbNF+kypuqat8mcUogVOQrSJMxcEkaypK2bhqpeAq99wvoNw8PidDq95R+UTY+JbY/TkqI+n5kiW7nUO9xB9/2w6y/TN9fgMATOw9zXzam+7987YkIrSJm7fPw== 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)(376002)(136003)(39860400002)(396003)(46966005)(356005)(82740400003)(5660300002)(966005)(426003)(6916009)(186003)(81166007)(83380400001)(47076004)(336012)(82310400003)(70586007)(70206006)(2616005)(26005)(6666004)(7696005)(478600001)(86362001)(8676002)(316002)(1076003)(54906003)(2906002)(44832011)(4326008)(36756003)(8936002)(40753002)(133343001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB5842 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT016.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 4d0b6a97-27e5-4c9a-e4f4-08d88301e1af X-Microsoft-Antispam-Message-Info: RsFCktLu8FNXC03tLEea8IHwPGIa7mUbg8cxaESuwcKu2VWFbO2iOHslY4NiZR37+vKHIvUil0G7t+5of+1O+9D8sulkCmIW2EG+htWaR0AkriGAUw0SqkNkKvbuG8JtqkRDePmw1NEnfPAW2nMpSxWTEYnweIMXRaIEg4KwJx8odB8QeJs+M2JjaYIZARsWVkJjZbYONv66DnGh19j3Lhnl620rTeQg0W2ikTJhkRoY/hKehHYRB7+95OVXseyAqugvK48wuspIVPO5qcdn41faOwxK6CoUZwRprKlOCmCB3KheBKUB+uR8ebO8h558pLi8H5I+RuFkNjWW1X4CInsvWv1H0zOR+YO4ykIxSXRQkvkE7R7rsgkf1aQ4pcB3Sm43HH8Pu/5YkZS4O1WFR48i29LTyYpx8+IK+beGID4yC4QnPpdO6Z0wDblv8xY3GOwpKt+bN+91h2lnbGY/FcbGoyjYvasdyVS2CsJvWHeWLrkjan5ry9fdXAwAo7nfcooLEitCaUMozFRVbqZXiQ== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2020 09:45:45.0201 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 98f25222-1dba-4875-362e-08d88301e61e 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: VE1EUR03FT016.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5758 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,sami.mujawar@arm.com X-Gm-Message-State: jCIKW4r5dq3qhQxriLXyFmjcx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604742350; bh=xndkbcbIxn1eMlCPra7FZimg0rgzvKEnmAK11bJtxIc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=nyWkH6naB6fvMD0Z9spP+ZlLw2XRxE6JJ7zah2ZFTzrUyD/sPrqC4LaRFLhqxq5Br3l 7pVq+8VNrEBqBJhcE6vhFx0cEDAUGx5OfH4xnD1RXuR25Goa8t8vpSqHJ4yEEMsk4WeSQ N3AY4hNB03+W7VuY736HrU4s1mX6fU4Gwcc= 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 Signed-off-by: Sami Mujawar --- Notes: v2: - No code change. Resending with v2 series. [SAMI] Ref: https://edk2.groups.io/g/devel/message/63245 =20 v1: - Merge the PlatformASLTablesLib and ConfigurationManagerDxe [Pierre] directories. Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManager.dsc.inc= | 10 ++----- Platform/ARM/VExpressPkg/ConfigurationManager/{PlatformASLTablesLib =3D> C= onfigurationManagerDxe/AslTables}/Dsdt.asl | 0 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.c | 5 +--- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManager.h | 8 +++++- Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/Conf= igurationManagerDxe.inf | 4 +-- Platform/ARM/VExpressPkg/ConfigurationManager/PlatformASLTablesLib/Platfor= mASLTablesLib.inf | 29 -------------------- 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/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 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/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/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 --=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 (#67121): https://edk2.groups.io/g/devel/message/67121 Mute This Topic: https://groups.io/mt/78092587/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 Mon Apr 29 14:11:24 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.108 as permitted sender) smtp.mailfrom=bounce+27952+67123+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=arm.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1604742356961158.77536506191927; Sat, 7 Nov 2020 01:45:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id lpyaYY1788612xzhQDupyawS; Sat, 07 Nov 2020 01:45:56 -0800 X-Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.58]) by mx.groups.io with SMTP id smtpd.web12.2070.1604742350261772483 for ; Sat, 07 Nov 2020 01:45:50 -0800 X-Received: from AM6P191CA0060.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:7f::37) by AS8PR08MB5960.eurprd08.prod.outlook.com (2603:10a6:20b:29a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Sat, 7 Nov 2020 09:45:46 +0000 X-Received: from VE1EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:7f:cafe::66) by AM6P191CA0060.outlook.office365.com (2603:10a6:209:7f::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19 via Frontend Transport; Sat, 7 Nov 2020 09:45:46 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+67123+1787277+3901457@groups.io; helo=mail02.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 VE1EUR03FT022.mail.protection.outlook.com (10.152.18.64) 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:46 +0000 X-Received: ("Tessian outbound 13ed5f5344c0:v71"); Sat, 07 Nov 2020 09:45:45 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d9b1c7886a33a2d6 X-CR-MTA-TID: 64aa7808 X-Received: from 03151befc520.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4BC0BD80-216B-4069-9D3E-64BCD171534B.1; Sat, 07 Nov 2020 09:45:40 +0000 X-Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 03151befc520.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Sat, 07 Nov 2020 09:45:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZBA2NBF3yQ26fac4Gw/PR+IRQFSRF1fSmnBgebLVvfivXrvhwFBTOFo4P7dpDbJgQhcUn5UrB4EWLT7w5BfjMD6c+DXZ17uvPzJYu6gIC0Jq+H11rNf2PbQlKucVEDihTWY2lz84+Sora/vz2l6ZMrrB9EOfNUGL1XWER/03ELsqEp4GgrFHbn0YyWtMPcuwuauCdekDZc6uKqZHSenaz1K3YkP5KFJ4IknY9LnztvpUOXbOLxmi6PLb6p3qqBuNV3z9RI+vWMh8TbzispqtKqpKriCG84QtSVA7+Y0ZUSMLhvIZ9K+WosTfWyDt+MTKUm8Rz0ATPI5+NyLqQTQjvg== 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=g1wU34EZw46PnFDUf+yIYBM7hlGJRQ3E4D8C/uzNEvE=; b=gz7U2AS7hiAyH3cG81XJ8bFzz2DAE3POOWCjikvZLFElYitHukkyqtDUsV8k9hW67a32iAHUyicE0c0WPXqnfwae1UB2ecV3Ur3XHF893L0bnt/qx584If7dydZx2uAQOTQv5R4uccANz2mBHFAwYwwpDow7LQiRKBMKVfZP3/R0gMJqIsDF4q5U17RtgrcSp7y6Bfte6I4kVXVUUEM1ypB2R4ZgH2OwOAAmaU/eT5FxE8HSZpzPwIDJXfGJ0MW5E60x4bjASvweiY0+/8wk6Ydz3T2U/kPratCVCdOqbz2DidpTtGpRQCVcmlL+pa4s++o34r1lOODw4bu8PkTF6g== 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 X-Received: from AM6P192CA0074.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::15) by AM0PR08MB4276.eurprd08.prod.outlook.com (2603:10a6:208:13a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Sat, 7 Nov 2020 09:45:38 +0000 X-Received: from AM5EUR03FT020.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8d:cafe::90) by AM6P192CA0074.outlook.office365.com (2603:10a6:209:8d::15) 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:38 +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; X-Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT020.mail.protection.outlook.com (10.152.16.116) 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:38 +0000 X-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:37 +0000 X-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:36 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , , , Subject: [edk2-devel] [PATCH edk2-platforms v2 3/3] Platform/ARM/Juno: Increase FD size Date: Sat, 7 Nov 2020 09:45:32 +0000 Message-ID: <20201107094532.42888-4-sami.mujawar@arm.com> 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: 96786b55-7a53-4ff3-bd39-08d88301e6bb X-MS-TrafficTypeDiagnostic: AM0PR08MB4276:|AS8PR08MB5960: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 42ZLb3L8BmszDvB8gOSPQrsVJiFRX6t0bAjXifgvl5yEacAXtggzAWo3UV60KZIu9ycwzV7PGhM1bQ1Bm4ifuI+mIOaboG4gbSYPX3HOhlpphkBJxMv4U2ky8S3BWVBs33a4t4aPxHdfkmOFRkVF7SBCYZhFXj4VrgI6s9a6ADMtxwpdRC33MAfp2whFS0xz7/ArROgm+NeQ1Ec3ztedoqugSUAGgZVCXl0oDG3kOoBE/ebFXGV6FCPdydyCwmL7UmaU+zY7jFqHEQmPrv1lDDz0vrjuVWoGvFnkJRonisEx+irc1V5/m1vds1ODyBXn/liGe5aGtMGTVHRIMu6gx2ybBp/jVlXlJrpAfZRGUm68gErOTtlTsGZ8igHpOzN/bgDUJELa4AQ+Rg3en99qsAHbyM7KNF66PFRtFe8ttqv22I1nhuyNwpCIveA6YGpqruKUQCBoeF7HYBcJD0iKzaqfYCHNtO9BM9ocp570pf0= 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)(396003)(346002)(136003)(39860400002)(376002)(46966005)(1076003)(2906002)(44832011)(8676002)(47076004)(186003)(6666004)(86362001)(82310400003)(54906003)(5660300002)(82740400003)(316002)(70586007)(83380400001)(966005)(478600001)(81166007)(356005)(70206006)(4326008)(7696005)(336012)(36756003)(26005)(426003)(8936002)(6916009)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4276 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 177809ec-14a9-4dcd-31c5-08d88301e21a X-Microsoft-Antispam-Message-Info: cnM09PK2vcIDzXIz3QvZgZxwC11M8FF0ztCsO6ARuezfMbJ6rbB25kWHyuQGvp2NY0c4BE7WHOKkCMCv5SrnAPWi6sgILVABljNfSP9nteDxKwZQEwbzsfOZ6tSJtlKQvl7AsCMfUQRTACBCGbO/e4E09VwQgIZ6HUL0FVeZ9yAT3VgXrfZD/OvEUPmg/NAmCb1vAUprwGMWQWkMrwjEFvJ98peGHQy1VwIplm0TmY4r0hzNNPdrz/we4sWFzbopiSI/G5Bj4H1iP2Ko6BaWbBMUkTY+qCK9RiwaE1F05Lgd7IQGCrSenaXG/MZRPA/PcJ176RefFcsW0o/fWwNjxheYfJ8igbNyNg1V1QAU82GTWu3Zva1ZmVTSQ2AaR/MwpWrm8/YHQYj93Zz+OJQ0+ROtzdkK5WiqXRRe1O7cJMgGBL+1rsh9IFXuf6mDp5URCOsC98ZE1XpJPoXw/FrHQr2J/sVWfXrswELIfMT0Q0s= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2020 09:45:46.0435 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 96786b55-7a53-4ff3-bd39-08d88301e6bb 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: VE1EUR03FT022.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5960 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,sami.mujawar@arm.com X-Gm-Message-State: dpEGYBD76PCxQDbAu5NvZ8Box1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1604742356; bh=6KqQO3yZw5+n2aKvsH2cXj1L5O/MARmU/oVAYG220U8=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=ROe2ApjjENtH19R9HnrnRFUfmidPvj535MoaRqziaxISfBp7xXmNLHTrt1EjPUrL2eW aj/3SjbvrAdmQgLCK6s+fxfANgtAEQxBQ0XipVUHG5o80cg1vyK+p8soeZqKld9LDwJv1 QrgRBzj9yoykw1jz/eFPtUUw1ThQHYyd09A= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pierre Gondois Dynamic Tables Framework has been updated to include support for SSDT Serial Port generator. The SSDT Serial port generator uses AmlLib library to parse, iterate and update AML nodes. The addition of these libraries to the Dynamic Tables Framework have increased the size requirement of the Firmware Device (FD) Image. The current FD size is not sufficient due to which the Juno firmware builds are failing. This patch adds one additional block to accommodate the increase in FD size. Signed-off-by: Pierre Gondois Signed-off-by: Sami Mujawar Acked-by: Ard Biesheuvel --- Notes: v2: - New patch introduced in this series. This patch has been [SAM= I] copied from the Dynamic AML platform support series at https://edk2.groups.io/g/devel/message/64169 This patch is needed as the Dynamic AML patches merged in DynamicTablesPkg have increased the firmware size. Platform/ARM/JunoPkg/ArmJuno.fdf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf b/Platform/ARM/JunoPkg/ArmJun= o.fdf index 5d791a4e16075073992a5646db34d094677837d2..f70d30c6a9d9d6eb73087dc673f= 0c9287d23d666 100644 --- a/Platform/ARM/JunoPkg/ArmJuno.fdf +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2018, ARM Limited. All rights reserved. +# Copyright (c) 2013-2019, Arm Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -20,12 +20,12 @@ =20 [FD.BL33_AP_UEFI] BaseAddress =3D 0xE0000000|gArmTokenSpaceGuid.PcdFdBaseAddress # The ba= se address of the Firmware in NOR Flash. -Size =3D 0x000F8000|gArmTokenSpaceGuid.PcdFdSize # The si= ze in bytes of the FLASH Device +Size =3D 0x000F9000|gArmTokenSpaceGuid.PcdFdSize # The si= ze in bytes of the FLASH Device ErasePolarity =3D 1 =20 # This one is tricky, it must be: BlockSize * NumBlocks =3D Size BlockSize =3D 0x00001000 -NumBlocks =3D 0xF8 +NumBlocks =3D 0xF9 =20 ##########################################################################= ###### # @@ -43,7 +43,7 @@ [FD.BL33_AP_UEFI] # ##########################################################################= ###### =20 -0x00000000|0x000F8000 +0x00000000|0x000F9000 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize FV =3D FVMAIN_COMPACT =20 --=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 (#67123): https://edk2.groups.io/g/devel/message/67123 Mute This Topic: https://groups.io/mt/78092589/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-