Failed in applying to current master (
apply log)
.../RISC-V/PlatformPkg/RiscVPlatformPkg.dec | 7 +-
.../RISC-V/ProcessorPkg/RiscVProcessorPkg.dec | 7 +-
.../RISC-V/PlatformPkg/RiscVPlatformPkg.dsc | 4 +-
.../RISC-V/ProcessorPkg/RiscVProcessorPkg.dsc | 5 +-
.../FirmwareContextProcessorSpecificLib.inf | 7 +-
.../OpensbiPlatformLib/OpensbiPlatformLib.inf | 2 +-
.../PeiCoreEntryPoint/PeiCoreEntryPoint.inf | 1 -
.../PlatformBootManagerLib.inf | 13 +-
.../PlatformMemoryTestLibNull.inf | 6 +-
.../PlatformSecPpiLibNull.inf | 8 +-
.../PlatformUpdateProgressLibNull.inf | 7 +-
.../Library/ResetSystemLib/ResetSystemLib.inf | 1 -
.../PlatformPkg/Universal/FdtPeim/FdtPeim.inf | 5 +-
.../Universal/Pei/PlatformPei/PlatformPei.inf | 14 +-
.../PlatformPkg/Universal/Sec/SecMain.inf | 1 +
.../RiscVFirmwareContextSbiLib.inf | 8 +-
.../RiscVFirmwareContextSscratchLib.inf | 4 +-
.../Library/Edk2OpensbiPlatformWrapperLib.h | 2 +-
.../FirmwareContextProcessorSpecificLib.h | 25 +-
.../Include/Library/PlatformSecPpiLib.h | 2 +-
.../Library/RiscVPlatformTempMemoryInitLib.h | 18 +-
.../PlatformBootManager.h | 44 +-
.../Universal/Pei/PlatformPei/Platform.h | 39 +-
.../PlatformPkg/Universal/Sec/SecMain.h | 37 +-
.../Include/IndustryStandard/RiscV.h | 156 ++---
.../Include/IndustryStandard/RiscVOpensbi.h | 28 +-
.../Include/Library/MachineModeTimerLib.h | 17 +
.../Include/Library/RiscVCpuLib.h | 76 ++-
.../Include/Library/RiscVEdk2SbiLib.h | 138 ++--
.../Include/Library/RiscVFirmwareContextLib.h | 6 +-
.../Include/Library/RiscVPlatformTimerLib.h | 25 +
.../ProcessorPkg/Include/OpensbiTypes.h | 73 ++-
.../Include/ProcessorSpecificHobData.h | 105 +--
.../RISC-V/ProcessorPkg/Include/RiscVImpl.h | 52 +-
.../Include/SmbiosProcessorSpecificData.h | 50 +-
.../CpuExceptionHandlerLib.h | 171 ++---
.../ProcessorPkg/Universal/CpuDxe/CpuDxe.h | 45 +-
.../Universal/SmbiosDxe/RiscVSmbiosDxe.h | 3 +-
.../Edk2OpensbiPlatformWrapperLib.c | 394 +++++------
.../FirmwareContextProcessorSpecificLib.c | 42 +-
.../OpensbiPlatformLib/OpensbiPlatform.c | 270 ++++++++
.../Library/OpensbiPlatformLib/Platform.c | 225 -------
.../PeiCoreEntryPoint/PeiCoreEntryPoint.c | 20 +-
.../PeiCoreInfoHobLibNull/CoreInfoHob.c | 2 +-
.../PlatformBootManager.c | 79 ++-
.../PlatformBootManagerLib/PlatformData.c | 20 +-
.../PlatformMemoryTestLibNull.c | 2 +-
.../PlatformSecPpiLibNull/PlatformSecPpiLib.c | 2 +-
.../Library/ResetSystemLib/ResetSystemLib.c | 40 +-
.../RiscVSpecialPlatformLib.c | 9 +-
.../PlatformPkg/Universal/FdtPeim/FdtPeim.c | 33 +-
.../Universal/Pei/PlatformPei/Fv.c | 9 +-
.../Universal/Pei/PlatformPei/MemDetect.c | 21 +-
.../Universal/Pei/PlatformPei/Platform.c | 168 +++--
.../PlatformPkg/Universal/Sec/SecMain.c | 379 +++++------
.../Library/PeiCoreInfoHobLib/CoreInfoHob.c | 2 +-
.../PeiServicesTablePointerOpenSbi.c | 22 +-
.../Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c | 617 ++++++++++--------
.../CpuExceptionHandlerLib.c | 34 +-
.../RiscVFirmwareContextSbiLib.c | 4 +-
.../RiscVFirmwareContextSscratchLib.c | 6 +-
.../RiscVFirmwareContextStvecLib.c | 8 +-
.../Library/RiscVTimerLib/RiscVTimerLib.c | 24 +-
.../ProcessorPkg/Universal/CpuDxe/CpuDxe.c | 72 +-
.../ProcessorPkg/Universal/FdtDxe/FdtDxe.c | 66 +-
.../Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c | 47 +-
.../Universal/SmbiosDxe/RiscVSmbiosDxe.c | 165 +++--
.../Library/PeiCoreInfoHobLib/CoreInfoHob.c | 4 +-
Platform/RISC-V/PlatformPkg/Readme.md | 14 +-
.../RISC-V/PlatformPkg/RiscVPlatformPkg.uni | 71 +-
.../Universal/Sec/Riscv64/SecEntry.S | 19 +-
.../PeiServicesTablePointerLibOpenSbi.uni | 15 +-
.../RISC-V/ProcessorPkg/RiscVProcessorPkg.uni | 18 +-
73 files changed, 2297 insertions(+), 1838 deletions(-)
create mode 100644 Silicon/RISC-V/ProcessorPkg/Include/Library/MachineModeTimerLib.h
create mode 100644 Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVPlatformTimerLib.h
create mode 100644 Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatform.c
delete mode 100644 Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/Platform.c