Failed in applying to current master (
apply log)
ArmPkg/ArmPkg.dsc | 6 +-
ArmPkg/Drivers/ArmGic/ArmGicSecLib.c | 58 -------
ArmPkg/Drivers/ArmScmiDxe/ArmScmiDxe.inf | 9 +-
.../ArmScmiPerformanceProtocolPrivate.h | 4 +-
ArmPkg/Drivers/ArmScmiDxe/Scmi.c | 10 +-
ArmPkg/Drivers/ArmScmiDxe/ScmiBaseProtocol.c | 24 +--
ArmPkg/Drivers/ArmScmiDxe/ScmiClockProtocol.c | 44 ++---
ArmPkg/Drivers/ArmScmiDxe/ScmiDxe.c | 10 +-
.../ArmScmiDxe/ScmiPerformanceProtocol.c | 30 ++--
ArmPkg/Drivers/ArmScmiDxe/ScmiPrivate.h | 48 +++---
ArmPkg/Drivers/CpuDxe/CpuMpCore.c | 4 +-
.../GenericWatchdogDxe/GenericWatchdogDxe.inf | 3 +-
.../MmCommunicationDxe/MmCommunicate.h | 8 +-
.../MmCommunicationDxe/MmCommunication.inf | 3 +-
ArmPkg/Include/Chipset/AArch64.h | 12 +-
ArmPkg/Include/Chipset/AArch64Mmu.h | 4 +-
ArmPkg/Include/Chipset/ArmCortexA5x.h | 8 +-
ArmPkg/Include/Chipset/ArmV7.h | 4 +-
ArmPkg/Include/Library/ArmGicLib.h | 8 +-
ArmPkg/Include/Library/OpteeLib.h | 11 +-
ArmPkg/Include/Protocol/ArmScmiBaseProtocol.h | 10 +-
.../Include/Protocol/ArmScmiClock2Protocol.h | 6 +-
.../Include/Protocol/ArmScmiClockProtocol.h | 32 ++--
.../Protocol/ArmScmiPerformanceProtocol.h | 14 +-
.../Library/ArmArchTimerLib/ArmArchTimerLib.c | 12 +-
.../ArmDisassemblerLib/ArmDisassembler.c | 159 +++++++++---------
.../ArmDisassemblerLib/ThumbDisassembler.c | 158 ++++++++---------
.../AArch64/AArch64Exception.c | 4 +-
.../AArch64/ExceptionSupport.S | 10 +-
.../ArmExceptionLib/Arm/ArmException.c | 5 +-
ArmPkg/Library/ArmSoftFloatLib/platform.h | 6 +
ArmPkg/Library/SemihostLib/SemihostLib.c | 26 +--
ArmPkg/Library/SemihostLib/SemihostLib.inf | 3 +-
ArmPkg/Library/SemihostLib/SemihostPrivate.h | 80 ++++-----
.../ArmMmuStandaloneMmLib.inf | 4 +-
ArmPlatformPkg/PrePeiCore/AArch64/Exception.S | 10 +-
36 files changed, 416 insertions(+), 431 deletions(-)
delete mode 100644 ArmPkg/Drivers/ArmGic/ArmGicSecLib.c