From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.18484.1641738476395174712 for ; Sun, 09 Jan 2022 06:27:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ventanamicro.com header.s=google header.b=Di3ugYt3; spf=pass (domain: ventanamicro.com, ip: 209.85.216.47, mailfrom: sunilvl@ventanamicro.com) Received: by mail-pj1-f47.google.com with SMTP id i8-20020a17090a138800b001b3936fb375so3921697pja.1 for ; Sun, 09 Jan 2022 06:27:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=G/Uzbwm8w3SBYrj6CjHBFgvPwtWmH/KbbMepd1PVfD4=; b=Di3ugYt3GBi5/zGyXfkB0L767hVjRD2L1y+0al5pOyTesugG1PyVPG/IBThrQn+RUM J8yGV5hbgoH7Zj1rHbLFKavJF1KLRs14xAa6fvH2OrtsaoAA6YK3hhpYPUhdaUGu3QEM pe9gZ61DsMSgbuSChRizJUyPfHSy1G8bk+7Y86T0kAZnu/X1FlD6Jrl5QVEHDmn8QUb+ 2IkETgQVHB0o+Agoi1KGxBEWzrtXAJBOk9lVLcVXOfrf3cPaGc7dbz2RUF3JAFfHBkL6 KyjXWTbnML4sW878ZVPROtQW/2aVXxERhFEk3WJtuUVcdGNn+o9WD4EGVqnENtbVMmuW WnsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=G/Uzbwm8w3SBYrj6CjHBFgvPwtWmH/KbbMepd1PVfD4=; b=Kh8UE/5jVPECKTLEVVIS++MD5Qaf2hqUIPle0LsmGPXbgozWq4xmVbhUZVyOFBLflj MmK7ESCBqJnNjC38v5ovqhPsTIW0nxK5+RZeYdqET0GHRR+BLPiZajYgsBJ/vv/oe/yz a/SW2UQvaDIiT8MQRkXipGpnlLqw4O5Xy6B9V1cpGjpDtSE0OM6yCO5UJTf+l6+Mie5w IHdkoukO+oe2Ni7KAL69l2WUaBWlj10+AmP6xWBr4mPpARVwW/pnNftt+pdd0NiUiJc/ AEEc9xB0N2Wi3kWJ0nvxE2AVc2Tp81zUzq0GXNYNuakF/hcreU4H9zG3FxHq7Blq4aVp YCKg== X-Gm-Message-State: AOAM531bb5U09Y0UAMUfZkSqqprVUL/Dslu28zWZLmWW0rQ9OXRpwWmI LjdyE8/scx/f1hEEU8qtJkNwfA== X-Google-Smtp-Source: ABdhPJwOeQGxEpN5TeaclOIy3EOOZLx9DPsbfY0xYnrVnsQh80b8LC44UVlwnyELIT0mkdH7IGiZ9w== X-Received: by 2002:a17:90a:fe04:: with SMTP id ck4mr8689590pjb.216.1641738475679; Sun, 09 Jan 2022 06:27:55 -0800 (PST) Return-Path: Received: from sunil-ThinkPad-T490 ([49.206.3.187]) by smtp.gmail.com with ESMTPSA id b12sm4171427pfl.121.2022.01.09.06.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 06:27:55 -0800 (PST) Date: Sun, 9 Jan 2022 19:57:49 +0530 From: "Sunil V L" To: Abner Chang Cc: devel@edk2.groups.io, Daniel Schaefer Subject: Re: [PATCH 63/79] RiscVPkg: Rename ProcessorPkg to RiscVPkg Message-ID: <20220109142749.GA4879@sunil-ThinkPad-T490> References: <20220108041420.16064-1-abner.chang@hpe.com> <20220108041420.16064-2-abner.chang@hpe.com> MIME-Version: 1.0 In-Reply-To: <20220108041420.16064-2-abner.chang@hpe.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Sat, Jan 08, 2022 at 12:14:04PM +0800, Abner Chang wrote: > ProcessorPkg is migrated from edk2-platforms for > RISC-V (Silicon/RISC-V/ProcessorPkg). Rename it to > RiscVPkg under edk2. > > Signed-off-by: Abner Chang > Cc: Daniel Schaefer > Cc: Sunil V L > --- > .../RiscVPkg.dec | 6 +- > .../RiscVPkg.dsc | 58 +++++++++---------- > RiscVPlatformPkg/RiscVPlatformPkg.dsc | 6 +- > .../PeiServicesTablePointerLibOpenSbi.inf | 2 +- > .../Library/RiscVCpuLib/RiscVCpuLib.inf | 2 +- > .../RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf | 4 +- > .../CpuExceptionHandlerDxeLib.inf | 2 +- > .../RiscVFirmwareContextSbiLib.inf | 2 +- > .../RiscVFirmwareContextSscratchLib.inf | 2 +- > .../RiscVFirmwareContextStvecLib.inf | 2 +- > .../RiscVOpensbiLib/RiscVOpensbiLib.inf | 2 +- > .../RiscVPlatformTimerLib.inf | 0 > .../EmulatedMachineModeTimerLib.inf | 2 +- > .../MachineModeTimerLib.inf | 2 +- > .../RiscVTimerLib/BaseRiscVTimerLib.inf | 2 +- > .../Universal/CpuDxe/CpuDxe.inf | 2 +- > .../Universal/FdtDxe/FdtDxe.inf | 2 +- > .../Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf | 0 > .../Universal/SmbiosDxe/RiscVSmbiosDxe.inf | 2 +- > .../Edk2OpensbiPlatformWrapperLib.inf | 2 +- > .../FirmwareContextProcessorSpecificLib.inf | 2 +- > .../OpensbiPlatformLib/OpensbiPlatformLib.inf | 2 +- > .../PeiCoreEntryPoint/PeiCoreEntryPoint.inf | 2 +- > .../PeiCoreInfoHobLib.inf | 2 +- > .../PlatformSecPpiLibNull.inf | 1 - > .../Library/ResetSystemLib/ResetSystemLib.inf | 2 +- > .../RiscVSpecialPlatformLibNull.inf | 2 +- > .../Universal/FdtPeim/FdtPeim.inf | 2 +- > .../Universal/Pei/PlatformPei/PlatformPei.inf | 2 +- > RiscVPlatformPkg/Universal/Sec/SecMain.inf | 2 +- > .../Include/IndustryStandard/RiscV.h | 0 > .../Include/IndustryStandard/RiscVOpensbi.h | 0 > .../Include/Library/RiscVCpuLib.h | 0 > .../Include/Library/RiscVEdk2SbiLib.h | 0 > .../Include/Library/RiscVFirmwareContextLib.h | 0 > .../Include/OpensbiTypes.h | 0 > .../Include/ProcessorSpecificHobData.h | 0 > .../Include/RiscVImpl.h | 0 > .../Include/SmbiosProcessorSpecificData.h | 0 > .../CpuExceptionHandlerLib.h | 0 > .../Universal/CpuDxe/CpuDxe.h | 0 > .../Universal/SmbiosDxe/RiscVSmbiosDxe.h | 0 > .../PeiServicesTablePointerOpenSbi.c | 0 > .../Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c | 0 > .../CpuExceptionHandlerLib.c | 0 > .../RiscVFirmwareContextSbiLib.c | 0 > .../RiscVFirmwareContextSscratchLib.c | 0 > .../RiscVFirmwareContextStvecLib.c | 0 > .../Library/RiscVTimerLib/RiscVTimerLib.c | 0 > .../Universal/CpuDxe/CpuDxe.c | 0 > .../Universal/FdtDxe/FdtDxe.c | 0 > .../Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c | 0 > .../Universal/SmbiosDxe/RiscVSmbiosDxe.c | 0 > .../PeiServicesTablePointerLibOpenSbi.uni | 0 > .../Library/RiscVCpuLib/Cpu.S | 0 > .../CpuExceptionHandlerLib.uni | 0 > .../RiscVExceptionLib/SupervisorTrapHandler.S | 0 > .../RiscVPlatformTimerLibNull.S | 0 > .../EmulatedMachineModeTimerLib.S | 0 > .../MachineModeTimerLib/MachineModeTimerLib.S | 0 > .../RiscVPkg.uni | 2 +- > .../RiscVPkgExtra.uni | 2 +- > .../Universal/CpuDxe/CpuDxe.uni | 0 > .../Universal/CpuDxe/CpuDxeExtra.uni | 0 > .../Universal/SmbiosDxe/RiscVSmbiosDxe.uni | 0 > .../SmbiosDxe/RiscVSmbiosDxeExtra.uni | 0 > .../Library/RiscVOpensbiLib/opensbi | 1 - > 67 files changed, 62 insertions(+), 64 deletions(-) > rename Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec => RiscVPkg/RiscVPkg.dec (92%) > rename Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dsc => RiscVPkg/RiscVPkg.dsc (54%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf (92%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVCpuLib/RiscVCpuLib.inf (89%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf (79%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf (91%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf (90%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf (90%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf (89%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf (95%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf (89%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf (89%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVTimerLib/BaseRiscVTimerLib.inf (88%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/CpuDxe/CpuDxe.inf (91%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/FdtDxe/FdtDxe.inf (90%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/SmbiosDxe/RiscVSmbiosDxe.inf (92%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/IndustryStandard/RiscV.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/IndustryStandard/RiscVOpensbi.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/Library/RiscVCpuLib.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/Library/RiscVEdk2SbiLib.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/Library/RiscVFirmwareContextLib.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/OpensbiTypes.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/ProcessorSpecificHobData.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/RiscVImpl.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Include/SmbiosProcessorSpecificData.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVExceptionLib/CpuExceptionHandlerLib.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/CpuDxe/CpuDxe.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/SmbiosDxe/RiscVSmbiosDxe.h (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVExceptionLib/CpuExceptionHandlerLib.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVTimerLib/RiscVTimerLib.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/CpuDxe/CpuDxe.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/FdtDxe/FdtDxe.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/SmbiosDxe/RiscVSmbiosDxe.c (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.uni (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVCpuLib/Cpu.S (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVExceptionLib/CpuExceptionHandlerLib.uni (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVExceptionLib/SupervisorTrapHandler.S (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLibNull.S (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.S (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.S (100%) > rename Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.uni => RiscVPkg/RiscVPkg.uni (85%) > rename Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkgExtra.uni => RiscVPkg/RiscVPkgExtra.uni (87%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/CpuDxe/CpuDxe.uni (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/CpuDxe/CpuDxeExtra.uni (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/SmbiosDxe/RiscVSmbiosDxe.uni (100%) > rename {Silicon/RISC-V/ProcessorPkg => RiscVPkg}/Universal/SmbiosDxe/RiscVSmbiosDxeExtra.uni (100%) > delete mode 160000 Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi > > diff --git a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec b/RiscVPkg/RiscVPkg.dec > similarity index 92% > rename from Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > rename to RiscVPkg/RiscVPkg.dec > index 9c8b57cce3..f23d3c0135 100644 > --- a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > +++ b/RiscVPkg/RiscVPkg.dec > @@ -9,8 +9,8 @@ > > [Defines] > DEC_SPECIFICATION = 0x0001001b > - PACKAGE_NAME = RiscVProcessorPkg > - PACKAGE_UNI_FILE = RiscVProcessorPkg.uni > + PACKAGE_NAME = RiscVPkg > + PACKAGE_UNI_FILE = RiscVPkg.uni > PACKAGE_GUID = 993C7CAC-C87C-4F08-A2CF-AD3AABA859D1 > PACKAGE_VERSION = 1.0 > > @@ -46,4 +46,4 @@ > gUefiRiscVPkgTokenSpaceGuid.PcdRiscVMachineTimerFrequencyInHerz|10000000|UINT64|0x00001011 > > [UserExtensions.TianoCore."ExtraFiles"] > - RiscVProcessorPkgExtra.uni > + RiscVPkgExtra.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dsc b/RiscVPkg/RiscVPkg.dsc > similarity index 54% > rename from Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dsc > rename to RiscVPkg/RiscVPkg.dsc > index 5c7425421b..41933160d6 100644 > --- a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dsc > +++ b/RiscVPkg/RiscVPkg.dsc > @@ -1,5 +1,5 @@ > #/** @file > -# RISC-V processor package. > +# RISC-V package. > # > # Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All rights reserved.
> # > @@ -13,7 +13,7 @@ > # > ################################################################################ > [Defines] > - PLATFORM_NAME = RiscVProcessor > + PLATFORM_NAME = RiscV > PLATFORM_GUID = 55D77916-B270-41B4-9325-2CE9DCE0926E > PLATFORM_VERSION = 0.1 > DSC_SPECIFICATION = 0x0001001c > @@ -39,13 +39,13 @@ > !include MdePkg/MdeLibs.dsc.inc > > [LibraryClasses.common] > - CpuExceptionHandlerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > - RiscVCpuLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > - RiscVEdk2SbiLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > - RiscVOpensbiLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > - MachineModeTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > - #MachineModeTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf > + CpuExceptionHandlerLib|RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > + RiscVCpuLib|RiscVPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > + RiscVEdk2SbiLib|RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > + RiscVOpensbiLib|RiscVPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > + TimerLib|RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > + MachineModeTimerLib|RiscVPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > + #MachineModeTimerLib|RiscVPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf Is there a reason not to remove this? Regards Sunil > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf > @@ -66,43 +66,43 @@ > UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf > UefiLib|MdePkg/Library/UefiLib/UefiLib.inf > DevicePathLib|MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf > - RiscVPlatformTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > + RiscVPlatformTimerLib|RiscVPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > > [LibraryClasses.common.PEI_CORE] > - PeiServicesTablePointerLib|Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > - RiscVFirmwareContextLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > + PeiServicesTablePointerLib|RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > + RiscVFirmwareContextLib|RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > > [LibraryClasses.common.PEIM] > - PeiServicesTablePointerLib|Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > - RiscVFirmwareContextLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > + PeiServicesTablePointerLib|RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > + RiscVFirmwareContextLib|RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf > PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf > > [LibraryClasses.common.DXE_CORE] > - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > + TimerLib|RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > > [LibraryClasses.common.DXE_DRIVER] > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > PlatformBootManagerLib|Platform/RISC-V/PlatformPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf > > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > + TimerLib|RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > > [LibraryClasses.common.UEFI_DRIVER] > - TimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > + TimerLib|RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > > [Components] > - Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > - Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > - Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > - Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > - Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > - Silicon/RISC-V/ProcessorPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > - Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > - Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > + RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > + RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > + RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > + RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > + RiscVPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > + RiscVPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > + RiscVPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > + RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > > - Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf > - Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > - Silicon/RISC-V/ProcessorPkg/Universal/FdtDxe/FdtDxe.inf > - Silicon/RISC-V/ProcessorPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > + RiscVPkg/Universal/CpuDxe/CpuDxe.inf > + RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > + RiscVPkg/Universal/FdtDxe/FdtDxe.inf > + RiscVPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > diff --git a/RiscVPlatformPkg/RiscVPlatformPkg.dsc b/RiscVPlatformPkg/RiscVPlatformPkg.dsc > index 2997465170..f7f5c3f7cd 100644 > --- a/RiscVPlatformPkg/RiscVPlatformPkg.dsc > +++ b/RiscVPlatformPkg/RiscVPlatformPkg.dsc > @@ -41,8 +41,8 @@ > [LibraryClasses.common] > FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.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 > + RiscVCpuLib|RiscVPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > + RiscVEdk2SbiLib|RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > BaseLib|MdePkg/Library/BaseLib/BaseLib.inf > BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf > DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf > @@ -71,7 +71,7 @@ > > [LibraryClasses.common.SEC] > ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf > - RiscVOpensbiLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > + RiscVOpensbiLib|RiscVPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > Edk2OpensbiPlatformWrapperLib|RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf > RiscVSpecialPlatformLib|RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf > > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf b/RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > similarity index 92% > rename from Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > rename to RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > index fa9fe78518..d821168f3b 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > +++ b/RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.inf > @@ -30,7 +30,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > DebugLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf b/RiscVPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > similarity index 89% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > rename to RiscVPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > index 7928dd5536..9d44dc4343 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > +++ b/RiscVPkg/Library/RiscVCpuLib/RiscVCpuLib.inf > @@ -29,6 +29,6 @@ > [Packages] > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf b/RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > similarity index 79% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > rename to RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > index 18d6ebc2ac..75ef7c5b84 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > +++ b/RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.inf > @@ -20,8 +20,8 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > - Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec > + RiscVPkg/RiscVPkg.dec > + RiscVPlatformPkg/RiscVPlatformPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf b/RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > similarity index 91% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > rename to RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > index fc200d3cca..2463bac815 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > +++ b/RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerDxeLib.inf > @@ -39,5 +39,5 @@ > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf b/RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > similarity index 90% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > rename to RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > index 168b705453..db30d7e551 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > +++ b/RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.inf > @@ -25,7 +25,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > DebugLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf b/RiscVPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf > similarity index 90% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf > rename to RiscVPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf > index 750c1cf51f..c6a74e5edc 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf > +++ b/RiscVPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.inf > @@ -25,7 +25,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > DebugLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf b/RiscVPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf > similarity index 89% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf > rename to RiscVPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf > index fa894cda91..9888cac81a 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf > +++ b/RiscVPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.inf > @@ -25,7 +25,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > DebugLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf b/RiscVPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > similarity index 95% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > rename to RiscVPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > index e40a797896..31bdc9e4a7 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > +++ b/RiscVPkg/Library/RiscVOpensbiLib/RiscVOpensbiLib.inf > @@ -83,7 +83,7 @@ > [Packages] > EmbeddedPkg/EmbeddedPkg.dec # For libfdt. > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [BuildOptions] > GCC:*_*_*_PP_FLAGS = -D__ASSEMBLY__ > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf b/RiscVPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > rename to RiscVPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLib.inf > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf b/RiscVPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf > similarity index 89% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf > rename to RiscVPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf > index 369028a9a6..7a21a4267c 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf > +++ b/RiscVPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.inf > @@ -28,7 +28,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > > > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf b/RiscVPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > similarity index 89% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > rename to RiscVPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > index 71d4315445..fb67ce8bba 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > +++ b/RiscVPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf > @@ -28,7 +28,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > RiscVCpuLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf b/RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > similarity index 88% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > rename to RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > index 3c61149da8..5fb1adf160 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > +++ b/RiscVPkg/Library/RiscVTimerLib/BaseRiscVTimerLib.inf > @@ -20,7 +20,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [Pcd] > gUefiRiscVPkgTokenSpaceGuid.PcdRiscVMachineTimerTickInNanoSecond > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf b/RiscVPkg/Universal/CpuDxe/CpuDxe.inf > similarity index 91% > rename from Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf > rename to RiscVPkg/Universal/CpuDxe/CpuDxe.inf > index a422c12e32..77e8273ab9 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.inf > +++ b/RiscVPkg/Universal/CpuDxe/CpuDxe.inf > @@ -19,7 +19,7 @@ > [Packages] > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/FdtDxe/FdtDxe.inf b/RiscVPkg/Universal/FdtDxe/FdtDxe.inf > similarity index 90% > rename from Silicon/RISC-V/ProcessorPkg/Universal/FdtDxe/FdtDxe.inf > rename to RiscVPkg/Universal/FdtDxe/FdtDxe.inf > index ae6468f9f5..acc7d1da15 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Universal/FdtDxe/FdtDxe.inf > +++ b/RiscVPkg/Universal/FdtDxe/FdtDxe.inf > @@ -25,7 +25,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > - Platform/RISC-V/PlatformPkg/RiscVPlatformPkg.dec > + RiscVPlatformPkg/RiscVPlatformPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > > [LibraryClasses] > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf b/RiscVPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > rename to RiscVPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.inf > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf b/RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > similarity index 92% > rename from Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > rename to RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > index 0fcfe1d3ad..7a3c51700a 100644 > --- a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > +++ b/RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.inf > @@ -19,7 +19,7 @@ > [Packages] > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf b/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf > index 92723840c4..f19dd6b0e6 100644 > --- a/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf > +++ b/RiscVPlatformPkg/Library/Edk2OpensbiPlatformWrapperLib/Edk2OpensbiPlatformWrapperLib.inf > @@ -28,7 +28,7 @@ > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [Pcd] > gUefiRiscVPlatformPkgTokenSpaceGuid.PcdFirmwareDomainBaseAddress > diff --git a/RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf b/RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf > index 69568511ce..8ea37ae4f4 100644 > --- a/RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf > +++ b/RiscVPlatformPkg/Library/FirmwareContextProcessorSpecificLib/FirmwareContextProcessorSpecificLib.inf > @@ -20,7 +20,7 @@ > [Packages] > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf b/RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf > index b073dd914c..8e3f07d833 100644 > --- a/RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf > +++ b/RiscVPlatformPkg/Library/OpensbiPlatformLib/OpensbiPlatformLib.inf > @@ -32,7 +32,7 @@ > MdePkg/MdePkg.dec > Platform/SiFive/U5SeriesPkg/U5SeriesPkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf b/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf > index fe6d28c038..af453f6650 100644 > --- a/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf > +++ b/RiscVPlatformPkg/Library/PeiCoreEntryPoint/PeiCoreEntryPoint.inf > @@ -27,7 +27,7 @@ > [Packages] > MdePkg/MdePkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf b/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf > index 2a0c3f6fd8..51facae79a 100644 > --- a/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf > +++ b/RiscVPlatformPkg/Library/PeiCoreInfoHobLibNull/PeiCoreInfoHobLib.inf > @@ -28,7 +28,7 @@ > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf b/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf > index 3712b20554..5b3570ce6d 100644 > --- a/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf > +++ b/RiscVPlatformPkg/Library/PlatformSecPpiLibNull/PlatformSecPpiLibNull.inf > @@ -28,7 +28,6 @@ > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - #Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > > [LibraryClasses] > #BaseLib > diff --git a/RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf b/RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf > index f876ae2056..0ce1e90b70 100644 > --- a/RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf > +++ b/RiscVPlatformPkg/Library/ResetSystemLib/ResetSystemLib.inf > @@ -26,7 +26,7 @@ > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > DebugLib > diff --git a/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf b/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf > index 1bcd550d8b..3f2e5eec18 100644 > --- a/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf > +++ b/RiscVPlatformPkg/Library/RiscVSpecialPlatformLibNull/RiscVSpecialPlatformLibNull.inf > @@ -30,7 +30,7 @@ > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.inf b/RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.inf > index 8dc58f0a8b..33b7f89805 100644 > --- a/RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.inf > +++ b/RiscVPlatformPkg/Universal/FdtPeim/FdtPeim.inf > @@ -30,7 +30,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > > [LibraryClasses] > DebugLib > diff --git a/RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf b/RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf > index 06243bc8c3..4b8e074b16 100644 > --- a/RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf > +++ b/RiscVPlatformPkg/Universal/Pei/PlatformPei/PlatformPei.inf > @@ -32,7 +32,7 @@ > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > UefiCpuPkg/UefiCpuPkg.dec > > [Guids] > diff --git a/RiscVPlatformPkg/Universal/Sec/SecMain.inf b/RiscVPlatformPkg/Universal/Sec/SecMain.inf > index 8f4b167ed2..caed51a54c 100644 > --- a/RiscVPlatformPkg/Universal/Sec/SecMain.inf > +++ b/RiscVPlatformPkg/Universal/Sec/SecMain.inf > @@ -31,7 +31,7 @@ > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > - Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.dec > + RiscVPkg/RiscVPkg.dec > RiscVPlatformPkg/RiscVPlatformPkg.dec > > [LibraryClasses] > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/IndustryStandard/RiscV.h b/RiscVPkg/Include/IndustryStandard/RiscV.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/IndustryStandard/RiscV.h > rename to RiscVPkg/Include/IndustryStandard/RiscV.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/IndustryStandard/RiscVOpensbi.h b/RiscVPkg/Include/IndustryStandard/RiscVOpensbi.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/IndustryStandard/RiscVOpensbi.h > rename to RiscVPkg/Include/IndustryStandard/RiscVOpensbi.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVCpuLib.h b/RiscVPkg/Include/Library/RiscVCpuLib.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVCpuLib.h > rename to RiscVPkg/Include/Library/RiscVCpuLib.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVEdk2SbiLib.h b/RiscVPkg/Include/Library/RiscVEdk2SbiLib.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVEdk2SbiLib.h > rename to RiscVPkg/Include/Library/RiscVEdk2SbiLib.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVFirmwareContextLib.h b/RiscVPkg/Include/Library/RiscVFirmwareContextLib.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/Library/RiscVFirmwareContextLib.h > rename to RiscVPkg/Include/Library/RiscVFirmwareContextLib.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/OpensbiTypes.h b/RiscVPkg/Include/OpensbiTypes.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/OpensbiTypes.h > rename to RiscVPkg/Include/OpensbiTypes.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/ProcessorSpecificHobData.h b/RiscVPkg/Include/ProcessorSpecificHobData.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/ProcessorSpecificHobData.h > rename to RiscVPkg/Include/ProcessorSpecificHobData.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/RiscVImpl.h b/RiscVPkg/Include/RiscVImpl.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/RiscVImpl.h > rename to RiscVPkg/Include/RiscVImpl.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Include/SmbiosProcessorSpecificData.h b/RiscVPkg/Include/SmbiosProcessorSpecificData.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Include/SmbiosProcessorSpecificData.h > rename to RiscVPkg/Include/SmbiosProcessorSpecificData.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.h b/RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.h > rename to RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.h b/RiscVPkg/Universal/CpuDxe/CpuDxe.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.h > rename to RiscVPkg/Universal/CpuDxe/CpuDxe.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.h b/RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.h > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.h > rename to RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.h > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c b/RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c > rename to RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerOpenSbi.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c b/RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c > rename to RiscVPkg/Library/RiscVEdk2SbiLib/RiscVEdk2SbiLib.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.c b/RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.c > rename to RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.c b/RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.c > rename to RiscVPkg/Library/RiscVFirmwareContextSbiLib/RiscVFirmwareContextSbiLib.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.c b/RiscVPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.c > rename to RiscVPkg/Library/RiscVFirmwareContextSscratchLib/RiscVFirmwareContextSscratchLib.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.c b/RiscVPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.c > rename to RiscVPkg/Library/RiscVFirmwareContextStvecLib/RiscVFirmwareContextStvecLib.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/RiscVTimerLib.c b/RiscVPkg/Library/RiscVTimerLib/RiscVTimerLib.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVTimerLib/RiscVTimerLib.c > rename to RiscVPkg/Library/RiscVTimerLib/RiscVTimerLib.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.c b/RiscVPkg/Universal/CpuDxe/CpuDxe.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.c > rename to RiscVPkg/Universal/CpuDxe/CpuDxe.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/FdtDxe/FdtDxe.c b/RiscVPkg/Universal/FdtDxe/FdtDxe.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/FdtDxe/FdtDxe.c > rename to RiscVPkg/Universal/FdtDxe/FdtDxe.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c b/RiscVPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c > rename to RiscVPkg/Universal/PciCpuIo2Dxe/PciCpuIo2Dxe.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c b/RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c > rename to RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.c > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.uni b/RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.uni > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.uni > rename to RiscVPkg/Library/PeiServicesTablePointerLibOpenSbi/PeiServicesTablePointerLibOpenSbi.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/Cpu.S b/RiscVPkg/Library/RiscVCpuLib/Cpu.S > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/Cpu.S > rename to RiscVPkg/Library/RiscVCpuLib/Cpu.S > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.uni b/RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.uni > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.uni > rename to RiscVPkg/Library/RiscVExceptionLib/CpuExceptionHandlerLib.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/SupervisorTrapHandler.S b/RiscVPkg/Library/RiscVExceptionLib/SupervisorTrapHandler.S > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVExceptionLib/SupervisorTrapHandler.S > rename to RiscVPkg/Library/RiscVExceptionLib/SupervisorTrapHandler.S > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLibNull.S b/RiscVPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLibNull.S > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLibNull.S > rename to RiscVPkg/Library/RiscVPlatformTimerLibNull/RiscVPlatformTimerLibNull.S > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.S b/RiscVPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.S > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.S > rename to RiscVPkg/Library/RiscVReadMachineModeTimer/EmulatedMachineModeTimerLib/EmulatedMachineModeTimerLib.S > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.S b/RiscVPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.S > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.S > rename to RiscVPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.S > diff --git a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.uni b/RiscVPkg/RiscVPkg.uni > similarity index 85% > rename from Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.uni > rename to RiscVPkg/RiscVPkg.uni > index 83da92fe40..7e470eb531 100644 > --- a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkg.uni > +++ b/RiscVPkg/RiscVPkg.uni > @@ -1,5 +1,5 @@ > // /** @file > -// RISC-V Processor Package Localized Strings and Content. > +// RISC-V Package Localized Strings and Content. > // > // Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.
> // > diff --git a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkgExtra.uni b/RiscVPkg/RiscVPkgExtra.uni > similarity index 87% > rename from Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkgExtra.uni > rename to RiscVPkg/RiscVPkgExtra.uni > index 207adfb671..f0f2019337 100644 > --- a/Silicon/RISC-V/ProcessorPkg/RiscVProcessorPkgExtra.uni > +++ b/RiscVPkg/RiscVPkgExtra.uni > @@ -9,5 +9,5 @@ > > #string STR_PROPERTIES_PACKAGE_NAME > #language en-US > -"RISC-V processor package" > +"RISC-V package" > > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.uni b/RiscVPkg/Universal/CpuDxe/CpuDxe.uni > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxe.uni > rename to RiscVPkg/Universal/CpuDxe/CpuDxe.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxeExtra.uni b/RiscVPkg/Universal/CpuDxe/CpuDxeExtra.uni > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/CpuDxe/CpuDxeExtra.uni > rename to RiscVPkg/Universal/CpuDxe/CpuDxeExtra.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.uni b/RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.uni > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.uni > rename to RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxe.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxeExtra.uni b/RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxeExtra.uni > similarity index 100% > rename from Silicon/RISC-V/ProcessorPkg/Universal/SmbiosDxe/RiscVSmbiosDxeExtra.uni > rename to RiscVPkg/Universal/SmbiosDxe/RiscVSmbiosDxeExtra.uni > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi > deleted file mode 160000 > index a731c7e369..0000000000 > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi > +++ /dev/null > @@ -1 +0,0 @@ > -Subproject commit a731c7e36988c3308e1978ecde491f2f6182d490 > -- > 2.31.1 >