Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPkg,MdePkg: Move ArmPkg/Chipset/ArmV7[|Mmu].h to MdePkg 

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

Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
This commit is contained in:
Pierre Gondois 2024-03-11 16:04:41 +01:00 committed by mergify[bot]
parent f2b9d5417d
commit c68fb69dfe
12 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPkg/Library/ArmExceptionLib/AArch64/AArch64Exception.c
View File

@ -10,7 +10,7 @@
#include <Uefi.h>
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#include <Library/MemoryAllocationLib.h>
#include <Protocol/DebugSupport.h> // for MAX_AARCH64_EXCEPTION

2
ArmPkg/Library/ArmExceptionLib/AArch64/ExceptionSupport.S
View File

@ -7,7 +7,7 @@
//
//------------------------------------------------------------------------------
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#include <Library/PcdLib.h>
#include <AsmMacroIoLibV8.h>
#include <Protocol/DebugSupport.h> // for exception type definitions

2
ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
View File

@ -13,7 +13,7 @@
#include <Library/ArmLib.h>
#include <Library/DebugLib.h>
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#include "AArch64Lib.h"
#include "ArmLibPrivate.h"

2
ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
View File

@ -9,7 +9,7 @@
#
#------------------------------------------------------------------------------
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#include <AsmMacroIoLibV8.h>
.set CTRL_M_BIT, (1 << 0)

2
ArmPkg/Library/ArmMmuLib/AArch64/ArmMmuLibCore.c
View File

@ -11,7 +11,7 @@
#include <Uefi.h>
#include <Pi/PiMultiPhase.h>
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#include <Library/BaseMemoryLib.h>
#include <Library/CacheMaintenanceLib.h>
#include <Library/MemoryAllocationLib.h>

2
ArmPlatformPkg/PrePeiCore/AArch64/Exception.S
View File

@ -5,7 +5,7 @@
#
#
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#include <AsmMacroIoLibV8.h>
#include <Base.h>
#include <AutoGen.h>

2
ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
View File

@ -6,7 +6,7 @@
#=======================================================================================
#include <AsmMacroIoLibV8.h>
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
// Setup EL1 while in EL1
ASM_FUNC(SetupExceptionLevel1)

2
ArmPlatformPkg/PrePi/AArch64/ArchPrePi.c
View File

@ -8,7 +8,7 @@
#include "PrePi.h"
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
VOID
ArchInitialize (

2
ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
View File

@ -8,7 +8,7 @@
#include "PrePi.h"
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
VOID
ArchInitialize (

2
ArmPkg/Include/Chipset/AArch64.h → MdePkg/Include/AArch64/AArch64.h
View File

@ -10,7 +10,7 @@
#ifndef AARCH64_H_
#define AARCH64_H_
#include <Chipset/AArch64Mmu.h>
#include <AArch64/AArch64Mmu.h>
// ARM Interrupt ID in Exception Table
#define ARM_ARCH_EXCEPTION_IRQ EXCEPT_AARCH64_IRQ

0
ArmPkg/Include/Chipset/AArch64Mmu.h → MdePkg/Include/AArch64/AArch64Mmu.h
View File

2
MdePkg/Include/Library/ArmLib.h
View File

@ -16,7 +16,7 @@
#ifdef MDE_CPU_ARM
#include <Chipset/ArmV7.h>
#elif defined (MDE_CPU_AARCH64)
#include <Chipset/AArch64.h>
#include <AArch64/AArch64.h>
#else
#error "Unknown chipset."
#endif