From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 804317803EA for ; Thu, 14 Mar 2024 14:52:06 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=QlU0yAzNbwYh7A6BLs8QAfzejPCGn8SAuTr9nQRz8Mo=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1710427925; v=1; b=jlS3cPchGiyWX6Rkfp7heot+6WE8EdJta6PVAz34EsNn8401soiME6KQ3a0EIhtUROIkuRba NTJKn9T+q1zvp8ZzVthPsFTxtNmSrt0iLLc5sFCee7YjtGyx7TmKMoUmeNT69MI1isf223SFlre eiy4rOEVnLDxp/9KtcxjxhwJD5+agSd0tyZuN9OqDTfvLP04z7DuJaPJzFymEKLlum6m3/xgoPc JaI9Z5oS7nnkBifTnL8ibOM20jr8Jke1pLbDZWjFvgvsuM1DdJ3ONtGO/CRW+V4BOI47s6qRaji 3AY53rUsOfZPt+wnpKiEwShDg/0Oc6dEMWDP8d3F7VXHw== X-Received: by 127.0.0.2 with SMTP id 8lOBYY7687511xlgeKbNnM62; Thu, 14 Mar 2024 07:52:05 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.14516.1710427924522583055 for ; Thu, 14 Mar 2024 07:52:04 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4669111FB; Thu, 14 Mar 2024 07:52:40 -0700 (PDT) X-Received: from e126645.arm.com (unknown [10.57.10.233]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8CD613F762; Thu, 14 Mar 2024 07:51:59 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Leif Lindholm , Liming Gao , Michael D Kinney , Sami Mujawar , Zhiguang Liu Subject: [edk2-devel] [PATCH v2 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg Date: Thu, 14 Mar 2024 15:51:43 +0100 Message-Id: <20240314145143.4102768-3-pierre.gondois@arm.com> In-Reply-To: <20240314145143.4102768-1-pierre.gondois@arm.com> References: <20240314145143.4102768-1-pierre.gondois@arm.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 14 Mar 2024 07:52:04 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: lwiamxXQfiWtX8h5Q84N3Dizx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=jlS3cPch; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Following the discussion at [1] and as the ArmLib relies on them, move ArmPkg/Chipset/ArmV7[|Mmu].h files to the MdePkg. Update the path to correctly include the moved files. [1] https://edk2.groups.io/g/devel/message/111566 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Pierre Gondois --- ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c | 2 +- ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c | 2 +- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c | 2 +- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 2 +- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c | 2 +- ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S | 2 +- MdePkg/Include/Library/ArmLib.h | 2 +- .../Chipset/ArmV7.h =3D> MdePkg/Include/Register/Arm/AArch32.h | 2 +- .../ArmV7Mmu.h =3D> MdePkg/Include/Register/Arm/AArch32Mmu.h | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename ArmPkg/Include/Chipset/ArmV7.h =3D> MdePkg/Include/Register/Arm/AAr= ch32.h (94%) rename ArmPkg/Include/Chipset/ArmV7Mmu.h =3D> MdePkg/Include/Register/Arm/= AArch32Mmu.h (100%) diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Lib= rary/ArmExceptionLib/Arm/ArmException.c index fc411b845d64..a3e12b73b602 100644 --- a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c +++ b/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c @@ -11,7 +11,7 @@ =0D #include =0D =0D -#include =0D +#include =0D =0D #include =0D =0D diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c b/ArmPkg/Library/ArmLib/A= rm/ArmV7Lib.c index 521d5be0de33..0ba823457c58 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.c @@ -13,7 +13,7 @@ #include =0D #include =0D =0D -#include =0D +#include =0D =0D #include "ArmV7Lib.h"=0D #include "ArmLibPrivate.h"=0D diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c b/ArmPkg/Libra= ry/ArmMmuLib/Arm/ArmMmuLibConvert.c index 52dbfd714029..c17e1203be91 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibConvert.c @@ -11,7 +11,7 @@ =0D #include =0D =0D -#include =0D +#include =0D =0D UINT32=0D ConvertSectionAttributesToPageAttributes (=0D diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/= ArmMmuLib/Arm/ArmMmuLibCore.c index 28e4cd9f1a77..d4df07514066 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c @@ -8,7 +8,7 @@ **/=0D =0D #include =0D -#include =0D +#include =0D #include =0D #include =0D #include =0D diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c b/ArmPkg/Librar= y/ArmMmuLib/Arm/ArmMmuLibUpdate.c index 548ee1303870..7655cb4152de 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibUpdate.c @@ -17,7 +17,7 @@ #include =0D #include =0D =0D -#include =0D +#include =0D =0D #define __EFI_MEMORY_RWX 0 // no restrictions=0D =0D diff --git a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S b/ArmPlatformPkg/P= rePi/Arm/ModuleEntryPoint.S index 6709dad0b9d1..bfe314ae2e3d 100644 --- a/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S +++ b/ArmPlatformPkg/PrePi/Arm/ModuleEntryPoint.S @@ -7,7 +7,7 @@ =0D #include =0D =0D -#include =0D +#include =0D =0D ASM_FUNC(_ModuleEntryPoint)=0D // Do early platform specific actions=0D diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLi= b.h index 552ae3684b93..70ca6ce63842 100644 --- a/MdePkg/Include/Library/ArmLib.h +++ b/MdePkg/Include/Library/ArmLib.h @@ -14,7 +14,7 @@ #include =0D =0D #ifdef MDE_CPU_ARM=0D - #include =0D + #include =0D #elif defined (MDE_CPU_AARCH64)=0D #include =0D #else=0D diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/MdePkg/Include/Register/Arm/A= Arch32.h similarity index 94% rename from ArmPkg/Include/Chipset/ArmV7.h rename to MdePkg/Include/Register/Arm/AArch32.h index 94620c087df2..e74e1e2bf833 100644 --- a/ArmPkg/Include/Chipset/ArmV7.h +++ b/MdePkg/Include/Register/Arm/AArch32.h @@ -10,7 +10,7 @@ #ifndef ARM_V7_H_=0D #define ARM_V7_H_=0D =0D -#include =0D +#include =0D =0D // ARM Interrupt ID in Exception Table=0D #define ARM_ARCH_EXCEPTION_IRQ EXCEPT_ARM_IRQ=0D diff --git a/ArmPkg/Include/Chipset/ArmV7Mmu.h b/MdePkg/Include/Register/Ar= m/AArch32Mmu.h similarity index 100% rename from ArmPkg/Include/Chipset/ArmV7Mmu.h rename to MdePkg/Include/Register/Arm/AArch32Mmu.h --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116761): https://edk2.groups.io/g/devel/message/116761 Mute This Topic: https://groups.io/mt/104927824/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-