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 9264394169E for ; Tue, 12 Mar 2024 09:19:33 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=TklJNZIaCrQwX9+LS4KANfTLRuj0xTxfD3pyu78FtfM=; 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=1710235172; v=1; b=H2MxSUTZ1p03YzwQFc8cwPugM/YQcMURDXIORYkOBcQTD3kqj2QqMI9xrMRGomIYA4wnMU2y 642X9z4eHq6uQNYWzAh7m2Pre6WkWKIL+UUPjUneFpuL6bij4eP3fo3XdNNX547TCLcJHjJgoHA coeMJK4zAXYU9JpnfowCGPzLYMxt1RbfqsB+Hmo5scqF0DsY3hIoCGFEAF7tJOlcy8IXaTrK2hP xEFqBOAbVScDUDiM84f+Qxg21GK89W1J1bdzc+EGKals/tlcZgfJyKg3CTnrYOPltvSeUMuXmuF VA69rFKcx6urGPQ8t0ABahONBrcuy2K7aUPofQXC1+sBg== X-Received: by 127.0.0.2 with SMTP id BeGcYY7687511xXOHUfuciZo; Tue, 12 Mar 2024 02:19:32 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.4387.1710235171736003895 for ; Tue, 12 Mar 2024 02:19:31 -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 97FD11595; Tue, 12 Mar 2024 02:20:08 -0700 (PDT) X-Received: from e126645.arm.com (unknown [10.57.11.232]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C08AF3F762; Tue, 12 Mar 2024 02:19:28 -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 2/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/Aarch64[|Mmu].h to MdePkg Date: Tue, 12 Mar 2024 10:18:50 +0100 Message-Id: <20240312091850.2320650-3-pierre.gondois@arm.com> In-Reply-To: <20240312091850.2320650-1-pierre.gondois@arm.com> References: <20240312091850.2320650-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: Tue, 12 Mar 2024 02:19:31 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 4rqLfrFKpgK9zK9yEKubFkzzx7686176AA= 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=H2MxSUTZ; 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/Aarch64[|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 +- ArmPkg/Include/Chipset/ArmV7.h =3D> MdePkg/Include/Arm/AArch32.h | 2 +- .../Chipset/ArmV7Mmu.h =3D> MdePkg/Include/Arm/AArch32Mmu.h | 0 MdePkg/Include/Library/ArmLib.h | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename ArmPkg/Include/Chipset/ArmV7.h =3D> MdePkg/Include/Arm/AArch32.h (9= 5%) rename ArmPkg/Include/Chipset/ArmV7Mmu.h =3D> MdePkg/Include/Arm/AArch32Mm= u.h (100%) diff --git a/ArmPkg/Library/ArmExceptionLib/Arm/ArmException.c b/ArmPkg/Lib= rary/ArmExceptionLib/Arm/ArmException.c index fc411b845d64..7652b97b43c7 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..6acc4d3e7cc5 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..bf3a874822ac 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..60dc6c987cbd 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..5e751cddd7d6 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..60e530e4f1c5 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/ArmPkg/Include/Chipset/ArmV7.h b/MdePkg/Include/Arm/AArch32.h similarity index 95% rename from ArmPkg/Include/Chipset/ArmV7.h rename to MdePkg/Include/Arm/AArch32.h index 94620c087df2..e7e6e4dcd0a2 100644 --- a/ArmPkg/Include/Chipset/ArmV7.h +++ b/MdePkg/Include/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/Arm/AArch32= Mmu.h similarity index 100% rename from ArmPkg/Include/Chipset/ArmV7Mmu.h rename to MdePkg/Include/Arm/AArch32Mmu.h diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLi= b.h index 852264dba289..71c2076652fa 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 --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116675): https://edk2.groups.io/g/devel/message/116675 Mute This Topic: https://groups.io/mt/104881292/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-