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 0F64A941B95 for ; Thu, 14 Mar 2024 14:52:00 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=nk5PVBLNjsqghMnNwY478z8elQ0nbGWH79NudpAJUOI=; 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=1710427919; v=1; b=1FlkuB+UFPymTvjbHZ+tS5N961RTD7Q5QbdTDXuQXuGvDgzTBaaBwxVw8XXMwo5l+zBqQ4GS sP/75NJb63l+YQDMmvHn+9pc9c1qnPwK4+MtKDI0m3SfqXGkLtJqqr8mdkO7feiznERQ4y5+CPr UE1/w7PhoS6Kkxhxe29tD51ZuysjdfE7d8342hOn2ze3Qlsa5uQNVPfbuJfkf90gIFEv1Uyn3Px 0OZ0jcczCdz9kMpQVZc4wpciLMdVzi0tbwtDcG2y4NpTQMLyGhtbZJ8yBxhpzra+cxUlj1wezI9 z1fs0Rwb+u5qfRsgGAPcRpf+X7tBrH1k9bEfLoYj9V5Ig== X-Received: by 127.0.0.2 with SMTP id HwS3YY7687511xEm5In9q7kZ; Thu, 14 Mar 2024 07:51:59 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.14513.1710427919055402842 for ; Thu, 14 Mar 2024 07:51:59 -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 D027F1063; Thu, 14 Mar 2024 07:52:34 -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 CEB7F3F762; Thu, 14 Mar 2024 07:51:54 -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 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/AArch64[|Mmu].h to MdePkg Date: Thu, 14 Mar 2024 15:51:42 +0100 Message-Id: <20240314145143.4102768-2-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:51:59 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Owt8L6djuf8zKVX7d3irq5Hqx7686176AA= 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=1FlkuB+U; 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: Ard Biesheuvel Cc: Leif Lindholm Cc: Sami Mujawar Cc: Gerd Hoffmann Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Pierre Gondois --- ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c | 2 +- ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S | 2 +- ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c | 2 +- ArmPkg/Library/ArmLib/AArch64/AArch64Support.S | 2 +- ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c | 2 +- ArmPlatformPkg/PrePeiCore/AArch64/Exception.S | 2 +- ArmPlatformPkg/PrePeiCore/AArch64/Helper.S | 2 +- ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c | 2 +- ArmVirtPkg/PrePi/AArch64/ArchPrePi.c | 2 +- MdePkg/Include/Library/ArmLib.h | 2 +- .../Chipset =3D> MdePkg/Include/Register/AArch64}/AArch64.h | 2 +- .../Chipset =3D> MdePkg/Include/Register/AArch64}/AArch64Mmu.h | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename {ArmPkg/Include/Chipset =3D> MdePkg/Include/Register/AArch64}/AArch= 64.h (94%) rename {ArmPkg/Include/Chipset =3D> MdePkg/Include/Register/AArch64}/AArch= 64Mmu.h (100%) diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/Ar= mPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c index ef6a132b8dfc..16eb51c6eb81 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c @@ -10,7 +10,7 @@ =0D #include =0D =0D -#include =0D +#include =0D #include =0D #include // for MAX_AARCH64_EXCEPTION=0D =0D diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S b/Ar= mPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S index cd9437b6aab8..6f67e2557654 100644 --- a/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S +++ b/ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S @@ -7,7 +7,7 @@ //=0D //------------------------------------------------------------------------= ------=0D =0D -#include =0D +#include =0D #include =0D #include =0D #include // for exception type definitions=0D diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/Ar= mLib/AArch64/AArch64Lib.c index 87285465871d..8afae1464f70 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c @@ -13,7 +13,7 @@ #include =0D #include =0D =0D -#include =0D +#include =0D =0D #include "AArch64Lib.h"=0D #include "ArmLibPrivate.h"=0D diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Librar= y/ArmLib/AArch64/AArch64Support.S index a7111e51882c..4bdfa7ac2ccb 100644 --- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S +++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S @@ -9,7 +9,7 @@ #=0D #-------------------------------------------------------------------------= -----=0D =0D -#include =0D +#include =0D #include =0D =0D .set CTRL_M_BIT, (1 << 0)=0D diff --git a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c b/ArmPkg/Libr= ary/ArmMmuLib/AArch64/ArmMmuLibCore.c index 9d9c623581fe..6833015ff93f 100644 --- a/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c @@ -11,7 +11,7 @@ =0D #include =0D #include =0D -#include =0D +#include =0D #include =0D #include =0D #include =0D diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg= /PrePeiCore/AArch64/Exception.S index ffb643a56df0..36105e31800f 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S @@ -5,7 +5,7 @@ #=0D #=0D =0D -#include =0D +#include =0D #include =0D #include =0D #include =0D diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S b/ArmPlatformPkg/Pr= ePeiCore/AArch64/Helper.S index 2a604b719b26..a956b4d99634 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S @@ -6,7 +6,7 @@ #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0D =0D #include =0D -#include =0D +#include =0D =0D // Setup EL1 while in EL1=0D ASM_FUNC(SetupExceptionLevel1)=0D diff --git a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c b/ArmPlatformPkg/PreP= i/AArch64/ArchPrePi.c index 296b029e08bf..a315413a9944 100644 --- a/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c +++ b/ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c @@ -8,7 +8,7 @@ =0D #include "PrePi.h"=0D =0D -#include =0D +#include =0D =0D VOID=0D ArchInitialize (=0D diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch6= 4/ArchPrePi.c index 9cab88ca086e..f4487b6a5197 100644 --- a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c +++ b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c @@ -8,7 +8,7 @@ =0D #include "PrePi.h"=0D =0D -#include =0D +#include =0D =0D VOID=0D ArchInitialize (=0D diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLi= b.h index 6aa8a48f07f3..552ae3684b93 100644 --- a/MdePkg/Include/Library/ArmLib.h +++ b/MdePkg/Include/Library/ArmLib.h @@ -16,7 +16,7 @@ #ifdef MDE_CPU_ARM=0D #include =0D #elif defined (MDE_CPU_AARCH64)=0D - #include =0D + #include =0D #else=0D #error "Unknown chipset."=0D #endif=0D diff --git a/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/Register/AAr= ch64/AArch64.h similarity index 94% rename from ArmPkg/Include/Chipset/AArch64.h rename to MdePkg/Include/Register/AArch64/AArch64.h index 5390bf0a2774..7d894fa8a0fc 100644 --- a/ArmPkg/Include/Chipset/AArch64.h +++ b/MdePkg/Include/Register/AArch64/AArch64.h @@ -10,7 +10,7 @@ #ifndef AARCH64_H_=0D #define AARCH64_H_=0D =0D -#include =0D +#include =0D =0D // ARM Interrupt ID in Exception Table=0D #define ARM_ARCH_EXCEPTION_IRQ EXCEPT_AARCH64_IRQ=0D diff --git a/ArmPkg/Include/Chipset/AArch64Mmu.h b/MdePkg/Include/Register/= AArch64/AArch64Mmu.h similarity index 100% rename from ArmPkg/Include/Chipset/AArch64Mmu.h rename to MdePkg/Include/Register/AArch64/AArch64Mmu.h --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116760): https://edk2.groups.io/g/devel/message/116760 Mute This Topic: https://groups.io/mt/104927820/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-