[PATCH 62/79] RiscVPlatformPkg: Rename PlatformPkg to RiscVPlatformPkg

["Abner Chang" <abner.chang@hpe.com>]

PlatformPkg is migrated from edk2-platforms for
RISC-V (Platform/RISC-V/PlatformPkg). Rename it ro
RiscVPlatformPkg under edk2.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 .../RiscVPlatformPkg.dec                      |  0
 .../RiscVPlatformPkg.dsc                      | 36 +++++++++----------
 .../Edk2OpensbiPlatformWrapperLib.inf         |  2 +-
 .../FirmwareContextProcessorSpecificLib.inf   |  0
 .../OpensbiPlatformLib/OpensbiPlatformLib.inf |  2 +-
 .../PeiCoreEntryPoint/PeiCoreEntryPoint.inf   |  2 +-
 .../PeiCoreInfoHobLib.inf                     |  2 +-
 .../PlatformBootManagerLib.inf                |  2 +-
 .../PlatformMemoryTestLibNull.inf             |  0
 .../PlatformSecPpiLibNull.inf                 |  2 +-
 .../PlatformUpdateProgressLibNull.inf         |  0
 .../Library/ResetSystemLib/ResetSystemLib.inf |  0
 .../RiscVPlatformTempMemoryInitLibNull.inf    |  2 +-
 .../RiscVSpecialPlatformLibNull.inf           |  2 +-
 .../Universal/FdtPeim/FdtPeim.inf             |  0
 .../Universal/Pei/PlatformPei/PlatformPei.inf |  4 +--
 .../Universal/Sec/SecMain.inf                 |  2 +-
 .../Library/Edk2OpensbiPlatformWrapperLib.h   |  0
 .../FirmwareContextProcessorSpecificLib.h     |  0
 .../Include/Library/PlatformSecPpiLib.h       |  0
 .../Library/RiscVPlatformTempMemoryInitLib.h  |  0
 .../Include/Library/RiscVSpecialPlatformLib.h |  0
 .../PlatformBootManager.h                     |  0
 .../Universal/Pei/PlatformPei/Platform.h      |  0
 .../Universal/Sec/SecMain.h                   |  0
 .../Edk2OpensbiPlatformWrapperLib.c           |  0
 .../FirmwareContextProcessorSpecificLib.c     |  0
 .../Library/OpensbiPlatformLib/Platform.c     |  0
 .../PeiCoreEntryPoint/PeiCoreEntryPoint.c     |  0
 .../PeiCoreInfoHobLibNull/CoreInfoHob.c       |  0
 .../PlatformBootManager.c                     |  0
 .../PlatformBootManagerLib/PlatformData.c     |  0
 .../PlatformMemoryTestLibNull.c               |  0
 .../PlatformSecPpiLibNull/PlatformSecPpiLib.c |  0
 .../PlatformUpdateProgressLibNull.c           |  0
 .../Library/ResetSystemLib/ResetSystemLib.c   |  0
 .../RiscVSpecialPlatformLib.c                 |  0
 .../Universal/FdtPeim/FdtPeim.c               |  0
 .../Universal/Pei/PlatformPei/Fv.c            |  0
 .../Universal/Pei/PlatformPei/MemDetect.c     |  0
 .../Universal/Pei/PlatformPei/Platform.c      |  0
 .../Universal/Sec/SecMain.c                   |  0
 .../Readme.md                                 |  0
 .../Documents/Media/RiscVEdk2BootProcess.svg  |  0
 .../Documents/Media/RiscVEdk2FwDomain.svg     |  0
 .../PeiCoreEntryPoint/PeiCoreEntryPoint.uni   |  0
 .../PlatformBootManagerLib/Strings.uni        |  0
 .../Riscv64/TempMemInit.S                     |  0
 .../RiscVPlatformPkg.uni                      |  0
 .../RiscVPlatformPkgExtra.uni                 |  0
 .../Universal/Sec/Riscv64/SecEntry.S          |  0
 51 files changed, 28 insertions(+), 30 deletions(-)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/RiscVPlatformPkg.dec (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/RiscVPlatformPkg.dsc (61%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf (92%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf (92%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf (90%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf (90%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf (93%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf (90%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/ResetSystemLib/ResetSystemLib.inf (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf (91%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf (91%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/FdtPeim/FdtPeim.inf (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Pei/PlatformPei/PlatformPei.inf (90%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Sec/SecMain.inf (94%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Include/Library/Edk2OpensbiPlatformWrapperLib.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Include/Library/FirmwareContextProcessorSpecificLib.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Include/Library/PlatformSecPpiLib.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Include/Library/RiscVPlatformTempMemoryInitLib.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Include/Library/RiscVSpecialPlatformLib.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformBootManagerLib/PlatformBootManager.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Pei/PlatformPei/Platform.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Sec/SecMain.h (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/OpensbiPlatformLib/Platform.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PeiCoreInfoHobLibNull/CoreInfoHob.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformBootManagerLib/PlatformBootManager.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformBootManagerLib/PlatformData.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformSecPpiLibNull/PlatformSecPpiLib.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/ResetSystemLib/ResetSystemLib.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLib.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/FdtPeim/FdtPeim.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Pei/PlatformPei/Fv.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Pei/PlatformPei/MemDetect.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Pei/PlatformPei/Platform.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Sec/SecMain.c (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Readme.md (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Documents/Media/RiscVEdk2BootProcess.svg (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Documents/Media/RiscVEdk2FwDomain.svg (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.uni (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/PlatformBootManagerLib/Strings.uni (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Library/RiscVPlatformTempMemoryInitLibNull/Riscv64/TempMemInit.S (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/RiscVPlatformPkg.uni (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/RiscVPlatformPkgExtra.uni (100%)
 rename {Platform/RISC-V/PlatformPkg => RiscVPlatformPkg}/Universal/Sec/Riscv64/SecEntry.S (100%)

diff --git a/Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec b/RiscVPlatformPkg/RiscVPlatformPkg.dec
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
rename to RiscVPlatformPkg/RiscVPlatformPkg.dec
diff --git a/Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dsc b/RiscVPlatformPkg/RiscVPlatformPkg.dsc
similarity index 61%
rename from Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dsc
rename to RiscVPlatformPkg/RiscVPlatformPkg.dsc
index 47a0fc4494..2997465170 100644
--- a/Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dsc
+++ b/RiscVPlatformPkg/RiscVPlatformPkg.dsc
@@ -40,7 +40,7 @@
 
 [LibraryClasses.common]
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
-  RiscVOpensbiPlatformLib|Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
+  RiscVOpensbiPlatformLib|RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
   RiscVCpuLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf
   RiscVEdk2SbiLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
@@ -60,11 +60,11 @@
 
 [LibraryClasses.common.PEI_CORE]
   # RISC-V platform PEI core entry point.
-  PeiCoreEntryPoint|Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  PlatformSecPpiLib|Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
+  PeiCoreEntryPoint|RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+  PlatformSecPpiLib|RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
 
 [LibraryClasses.common.PEIM]
-  FirmwareContextProcessorSpecificLib|Platform/RISC-V/PlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
+  FirmwareContextProcessorSpecificLib|RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
@@ -72,24 +72,24 @@
 [LibraryClasses.common.SEC]
   ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
   RiscVOpensbiLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf
-  Edk2OpensbiPlatformWrapperLib|Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
-  RiscVSpecialPlatformLib|Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
+  Edk2OpensbiPlatformWrapperLib|RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
+  RiscVSpecialPlatformLib|RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
 
 [LibraryClasses.common.DXE_DRIVER]
-  PlatformBootManagerLib|Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+  PlatformBootManagerLib|RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
 
 [Components.common]
-  Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
-  Platform/RISC-V/PlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf
-  Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
-  Platform/RISC-V/PlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf
-  Platform/RISC-V/PlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
-  Platform/RISC-V/PlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
-  Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
-  Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
-  Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
-  Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
+  RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
+  RiscVPlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf
+  RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+  RiscVPlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf
+  RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
+  RiscVPlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
+  RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+  RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
+  RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
+  RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
 
 [Components.common.SEC]
-  Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.inf
+  RiscVPlatformPkg/Universal/Sec/SecMain.inf
 
diff --git a/Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf b/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
similarity index 92%
rename from Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
rename to RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
index 8c268c556d..92723840c4 100644
--- a/Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
+++ b/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf
@@ -27,7 +27,7 @@
 [Packages]
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
 
 [Pcd]
diff --git a/Platform/RISC-V/PlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf b/RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
rename to RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf
diff --git a/Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf b/RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
similarity index 92%
rename from Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
rename to RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
index 6661ee8204..b073dd914c 100644
--- a/Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
+++ b/RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf
@@ -31,7 +31,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/SiFive/U5SeriesPkg/U5SeriesPkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf b/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
similarity index 90%
rename from Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
rename to RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
index 4f3af27bcf..fe6d28c038 100644
--- a/Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
+++ b/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf
@@ -26,7 +26,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/RISC-V/PlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf b/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf
similarity index 90%
rename from Platform/RISC-V/PlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf
rename to RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf
index 5a8db5071f..2a0c3f6fd8 100644
--- a/Platform/RISC-V/PlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf
+++ b/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf
@@ -27,7 +27,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
similarity index 93%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
rename to RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 2bf89a3c44..8022372fa6 100644
--- a/Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -30,7 +30,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf b/RiscVPlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf
rename to RiscVPlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.inf
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf b/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
similarity index 90%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
rename to RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
index 22f5751655..3712b20554 100644
--- a/Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
+++ b/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf
@@ -27,7 +27,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   #Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf b/RiscVPlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf
rename to RiscVPlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.inf
diff --git a/Platform/RISC-V/PlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf b/RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf
rename to RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf
diff --git a/Platform/RISC-V/PlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf b/RiscVPlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
similarity index 91%
rename from Platform/RISC-V/PlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
rename to RiscVPlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
index 1634a05f58..29e5d09fae 100644
--- a/Platform/RISC-V/PlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
+++ b/RiscVPlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/RiscVPlatformTempMemoryInitLibNull.inf
@@ -33,6 +33,6 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
 
 
diff --git a/Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf b/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
similarity index 91%
rename from Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
rename to RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
index 567eeee56d..1bcd550d8b 100644
--- a/Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
+++ b/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf
@@ -29,7 +29,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
 
 [LibraryClasses]
diff --git a/Platform/RISC-V/PlatformPkg/Universal/FdtPeim/FdtPeim.inf b/RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.inf
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/FdtPeim/FdtPeim.inf
rename to RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.inf
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf b/RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf
similarity index 90%
rename from Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf
rename to RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf
index 0db88abba4..06243bc8c3 100644
--- a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf
+++ b/RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf
@@ -31,10 +31,8 @@
 [Packages]
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
-  Platform/SiFive/U5SeriesPkg/U5SeriesPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
-  Silicon/SiFive/SiFive.dec
   UefiCpuPkg/UefiCpuPkg.dec
 
 [Guids]
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.inf b/RiscVPlatformPkg/Universal/Sec/SecMain.inf
similarity index 94%
rename from Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.inf
rename to RiscVPlatformPkg/Universal/Sec/SecMain.inf
index b949b6c470..8f4b167ed2 100644
--- a/Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.inf
+++ b/RiscVPlatformPkg/Universal/Sec/SecMain.inf
@@ -32,7 +32,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec
-  Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec
+  RiscVPlatformPkg/RiscVPlatformPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/RISC-V/PlatformPkg/Include/Library/Edk2OpensbiPlatformWrapperLib.h b/RiscVPlatformPkg/Include/Library/Edk2OpensbiPlatformWrapperLib.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Include/Library/Edk2OpensbiPlatformWrapperLib.h
rename to RiscVPlatformPkg/Include/Library/Edk2OpensbiPlatformWrapperLib.h
diff --git a/Platform/RISC-V/PlatformPkg/Include/Library/FirmwareContextProcessorSpecificLib.h b/RiscVPlatformPkg/Include/Library/FirmwareContextProcessorSpecificLib.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Include/Library/FirmwareContextProcessorSpecificLib.h
rename to RiscVPlatformPkg/Include/Library/FirmwareContextProcessorSpecificLib.h
diff --git a/Platform/RISC-V/PlatformPkg/Include/Library/PlatformSecPpiLib.h b/RiscVPlatformPkg/Include/Library/PlatformSecPpiLib.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Include/Library/PlatformSecPpiLib.h
rename to RiscVPlatformPkg/Include/Library/PlatformSecPpiLib.h
diff --git a/Platform/RISC-V/PlatformPkg/Include/Library/RiscVPlatformTempMemoryInitLib.h b/RiscVPlatformPkg/Include/Library/RiscVPlatformTempMemoryInitLib.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Include/Library/RiscVPlatformTempMemoryInitLib.h
rename to RiscVPlatformPkg/Include/Library/RiscVPlatformTempMemoryInitLib.h
diff --git a/Platform/RISC-V/PlatformPkg/Include/Library/RiscVSpecialPlatformLib.h b/RiscVPlatformPkg/Include/Library/RiscVSpecialPlatformLib.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Include/Library/RiscVSpecialPlatformLib.h
rename to RiscVPlatformPkg/Include/Library/RiscVSpecialPlatformLib.h
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h b/RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h
rename to RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.h
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.h b/RiscVPlatformPkg/Universal/Pei/PlatformPei/Platform.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.h
rename to RiscVPlatformPkg/Universal/Pei/PlatformPei/Platform.h
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.h b/RiscVPlatformPkg/Universal/Sec/SecMain.h
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.h
rename to RiscVPlatformPkg/Universal/Sec/SecMain.h
diff --git a/Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.c b/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.c
rename to RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.c b/RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.c
rename to RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/Platform.c b/RiscVPlatformPkg/Library/OpensbiPlatformLib/Platform.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/OpensbiPlatformLib/Platform.c
rename to RiscVPlatformPkg/Library/OpensbiPlatformLib/Platform.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c b/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
rename to RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PeiCoreInfoHobLibNull/CoreInfoHob.c b/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/CoreInfoHob.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PeiCoreInfoHobLibNull/CoreInfoHob.c
rename to RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/CoreInfoHob.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
rename to RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformData.c b/RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformData.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformData.c
rename to RiscVPlatformPkg/Library/PlatformBootManagerLib/PlatformData.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.c b/RiscVPlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.c
rename to RiscVPlatformPkg/Library/PlatformMemoryTestLibNull/PlatformMemoryTestLibNull.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLib.c b/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLib.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLib.c
rename to RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLib.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.c b/RiscVPlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.c
rename to RiscVPlatformPkg/Library/PlatformUpdateProgressLibNull/PlatformUpdateProgressLibNull.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/ResetSystemLib/ResetSystemLib.c b/RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/ResetSystemLib/ResetSystemLib.c
rename to RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.c
diff --git a/Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLib.c b/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLib.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLib.c
rename to RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLib.c
diff --git a/Platform/RISC-V/PlatformPkg/Universal/FdtPeim/FdtPeim.c b/RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/FdtPeim/FdtPeim.c
rename to RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.c
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Fv.c b/RiscVPlatformPkg/Universal/Pei/PlatformPei/Fv.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Fv.c
rename to RiscVPlatformPkg/Universal/Pei/PlatformPei/Fv.c
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/MemDetect.c b/RiscVPlatformPkg/Universal/Pei/PlatformPei/MemDetect.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/MemDetect.c
rename to RiscVPlatformPkg/Universal/Pei/PlatformPei/MemDetect.c
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.c b/RiscVPlatformPkg/Universal/Pei/PlatformPei/Platform.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Pei/PlatformPei/Platform.c
rename to RiscVPlatformPkg/Universal/Pei/PlatformPei/Platform.c
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.c b/RiscVPlatformPkg/Universal/Sec/SecMain.c
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Sec/SecMain.c
rename to RiscVPlatformPkg/Universal/Sec/SecMain.c
diff --git a/Platform/RISC-V/PlatformPkg/Readme.md b/RiscVPlatformPkg/Readme.md
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Readme.md
rename to RiscVPlatformPkg/Readme.md
diff --git a/Platform/RISC-V/PlatformPkg/Documents/Media/RiscVEdk2BootProcess.svg b/RiscVPlatformPkg/Documents/Media/RiscVEdk2BootProcess.svg
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Documents/Media/RiscVEdk2BootProcess.svg
rename to RiscVPlatformPkg/Documents/Media/RiscVEdk2BootProcess.svg
diff --git a/Platform/RISC-V/PlatformPkg/Documents/Media/RiscVEdk2FwDomain.svg b/RiscVPlatformPkg/Documents/Media/RiscVEdk2FwDomain.svg
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Documents/Media/RiscVEdk2FwDomain.svg
rename to RiscVPlatformPkg/Documents/Media/RiscVEdk2FwDomain.svg
diff --git a/Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.uni b/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.uni
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.uni
rename to RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.uni
diff --git a/Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/Strings.uni b/RiscVPlatformPkg/Library/PlatformBootManagerLib/Strings.uni
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/Strings.uni
rename to RiscVPlatformPkg/Library/PlatformBootManagerLib/Strings.uni
diff --git a/Platform/RISC-V/PlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/Riscv64/TempMemInit.S b/RiscVPlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/Riscv64/TempMemInit.S
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/Riscv64/TempMemInit.S
rename to RiscVPlatformPkg/Library/RiscVPlatformTempMemoryInitLibNull/Riscv64/TempMemInit.S
diff --git a/Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.uni b/RiscVPlatformPkg/RiscVPlatformPkg.uni
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.uni
rename to RiscVPlatformPkg/RiscVPlatformPkg.uni
diff --git a/Platform/RISC-V/PlatformPkg/RiscVPlatformPkgExtra.uni b/RiscVPlatformPkg/RiscVPlatformPkgExtra.uni
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/RiscVPlatformPkgExtra.uni
rename to RiscVPlatformPkg/RiscVPlatformPkgExtra.uni
diff --git a/Platform/RISC-V/PlatformPkg/Universal/Sec/Riscv64/SecEntry.S b/RiscVPlatformPkg/Universal/Sec/Riscv64/SecEntry.S
similarity index 100%
rename from Platform/RISC-V/PlatformPkg/Universal/Sec/Riscv64/SecEntry.S
rename to RiscVPlatformPkg/Universal/Sec/Riscv64/SecEntry.S
-- 
2.31.1