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 A8382941830 for ; Tue, 12 Mar 2024 09:19:30 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=7wG/D0i/CHeQxuD1kn+9jXRBkctryM9gb+NaGg0Ds9o=; 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=1710235169; v=1; b=m/o3pand0wItafDlADOnd7NuEJTRwPKq963nCM2/q1ToBD3ZhcAFoH4CqJQnUZAbrYAnF2GJ xu+8X7C8wAEwmIgzaNUty5PSFeqTpaz6mPcFOcicCUPYxCZPSA3h/k29cM1PI7BHz6BByUO+xg2 trgfUpRq6quo3WrJkWHGb256vF5Kqee7OgmqnWYk86UroFlcNLjC2ElI+2DHpM95iSe5zF92NRa 1M4dawoFV8IDR6uZmXqMLn03RXS/7agRNgYRvQU8qO+9Ze9/F30gtBz8caR+rvxMoZcaeOzxJrJ 8hp+vgMGkkZcWmlfHm+5zhxdOGwNkPNg71M5xCcfvTtkA== X-Received: by 127.0.0.2 with SMTP id NyqfYY7687511xEg6MQSDzh8; Tue, 12 Mar 2024 02:19:29 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4397.1710235168655966820 for ; Tue, 12 Mar 2024 02:19:28 -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 85ECF1570; Tue, 12 Mar 2024 02:20:05 -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 E14923F762; Tue, 12 Mar 2024 02:19:25 -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 1/2] ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg Date: Tue, 12 Mar 2024 10:18:49 +0100 Message-Id: <20240312091850.2320650-2-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:28 -0700 Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: tWx1lUOQO1AT2DDnMwpW2vTNx7686176AA= 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="m/o3pand"; 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: 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 +- {ArmPkg/Include/Chipset =3D> MdePkg/Include/AArch64}/AArch64.h | 2 +- {ArmPkg/Include/Chipset =3D> MdePkg/Include/AArch64}/AArch64Mmu.h | 0 MdePkg/Include/Library/ArmLib.h | 2 +- 12 files changed, 11 insertions(+), 11 deletions(-) rename {ArmPkg/Include/Chipset =3D> MdePkg/Include/AArch64}/AArch64.h (94%) rename {ArmPkg/Include/Chipset =3D> MdePkg/Include/AArch64}/AArch64Mmu.h (= 100%) diff --git a/ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c b/Ar= mPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c index ef6a132b8dfc..b0c2e39cd910 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..f5cbc2e97c3b 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..6739f5c37d38 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..177d10e66d5d 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..6a1f3f947788 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..d0d6bc44f78c 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..9b81b96a4949 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..27a85049fa78 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..493628b8880d 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/ArmPkg/Include/Chipset/AArch64.h b/MdePkg/Include/AArch64/AArc= h64.h similarity index 94% rename from ArmPkg/Include/Chipset/AArch64.h rename to MdePkg/Include/AArch64/AArch64.h index 5390bf0a2774..a77c3a95f1b5 100644 --- a/ArmPkg/Include/Chipset/AArch64.h +++ b/MdePkg/Include/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/AArch64/A= Arch64Mmu.h similarity index 100% rename from ArmPkg/Include/Chipset/AArch64Mmu.h rename to MdePkg/Include/AArch64/AArch64Mmu.h diff --git a/MdePkg/Include/Library/ArmLib.h b/MdePkg/Include/Library/ArmLi= b.h index 6aa8a48f07f3..852264dba289 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 --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116674): https://edk2.groups.io/g/devel/message/116674 Mute This Topic: https://groups.io/mt/104881291/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-