From 7fbd1eb2312d3dfab2ac8cdfcefc234c73d8aeeb Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Fri, 29 May 2015 13:50:43 +0000 Subject: [PATCH] Renamed ArmPlatformPkg/ArmVirtualizationPkg into ArmVirtPkg Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin Reviewed-by: Laszlo Ersek Tested-by: Laszlo Ersek git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17537 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ArmPsciResetSystemLib.c | 4 +- .../ArmVirt.dsc.inc | 18 ++++----- .../ArmVirtPkg.dec | 16 ++++---- .../ArmVirtQemu.dsc | 38 +++++++++---------- .../ArmVirtQemu.fdf | 8 ++-- .../ArmVirtXen.dsc | 32 ++++++++-------- .../ArmVirtXen.fdf | 8 ++-- .../Include/ArmPlatform.h | 0 .../Include/Guid/EarlyPL011BaseAddress.h | 0 .../ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf | 2 +- .../Library/ArmVirtDxeHobLib}/HobLib.c | 0 .../ArmVirtMemoryInitPeiLib.c | 0 .../ArmVirtMemoryInitPeiLib.inf | 2 +- .../ArmVirtPlatformLib}/AARCH64/VirtHelper.S | 0 .../ArmVirtPlatformLib}/ARM/VirtHelper.S | 0 .../ArmVirtPlatformLib}/ARM/VirtHelper.asm | 0 .../ArmVirtPlatformLib/ArmVirtPlatformLib.inf | 6 +-- .../Library/ArmVirtPlatformLib}/Virt.c | 0 .../Library/ArmVirtPlatformLib}/VirtMem.c | 0 .../ArmVirtPsciResetSystemLib.c | 0 .../ArmVirtPsciResetSystemLib.inf | 8 ++-- .../AARCH64/MemnodeParser.S | 0 .../AARCH64/RelocatableVirtHelper.S | 0 .../ArmXenRelocatablePlatformLib.inf | 6 +-- .../RelocatableVirt.c | 0 .../ArmXenRelocatablePlatformLib/XenVirtMem.c | 0 .../BaseCachingPciExpressLib.inf | 0 .../BaseCachingPciExpressLib/PciExpressLib.c | 0 .../EarlyFdtPL011SerialPortLib.c | 0 .../EarlyFdtPL011SerialPortLib.inf | 6 +-- .../FdtPL011SerialPortLib.c | 0 .../FdtPL011SerialPortLib.inf | 4 +- .../Library/NorFlashQemuLib/NorFlashQemuLib.c | 0 .../NorFlashQemuLib/NorFlashQemuLib.inf | 0 .../PlatformIntelBdsLib/IntelBdsPlatform.c | 0 .../PlatformIntelBdsLib/IntelBdsPlatform.h | 0 .../PlatformIntelBdsLib.inf | 0 .../Library/PlatformIntelBdsLib/QemuKernel.c | 0 .../Library/PlatformPeiLib/PlatformPeiLib.c | 0 .../Library/PlatformPeiLib/PlatformPeiLib.inf | 8 ++-- .../Library/QemuFwCfgLib/QemuFwCfgLib.c | 0 .../Library/QemuFwCfgLib/QemuFwCfgLib.inf | 6 +-- .../XenRealTimeClockLib/XenRealTimeClockLib.c | 0 .../XenRealTimeClockLib.inf | 0 .../PciHostBridgeDxe/PciHostBridge.c | 0 .../PciHostBridgeDxe/PciHostBridge.h | 0 .../PciHostBridgeDxe/PciHostBridgeDxe.inf | 4 +- .../PciHostBridgeDxe/PciRootBridgeIo.c | 0 .../PrePi/AArch64/ArchPrePi.c | 0 .../PrePi/AArch64/ModuleEntryPoint.S | 0 .../PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 6 +-- .../PrePi/LzmaDecompress.h | 0 .../PrePi/PrePi.c | 0 .../PrePi/PrePi.h | 0 .../PrePi/Scripts/PrePi-PIE.lds | 0 .../VirtFdtDxe/VirtFdtDxe.c | 0 .../VirtFdtDxe/VirtFdtDxe.inf | 8 ++-- 57 files changed, 95 insertions(+), 95 deletions(-) rename ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc => ArmVirtPkg/ArmVirt.dsc.inc (93%) rename ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec => ArmVirtPkg/ArmVirtPkg.dec (80%) rename ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc => ArmVirtPkg/ArmVirtQemu.dsc (87%) rename ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf => ArmVirtPkg/ArmVirtQemu.fdf (95%) rename ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc => ArmVirtPkg/ArmVirtXen.dsc (85%) rename ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf => ArmVirtPkg/ArmVirtXen.fdf (94%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Include/ArmPlatform.h (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Include/Guid/EarlyPL011BaseAddress.h (100%) rename ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf => ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf (93%) rename {ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib => ArmVirtPkg/Library/ArmVirtDxeHobLib}/HobLib.c (100%) rename ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.c => ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c (100%) rename ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf => ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf (95%) rename {ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/AARCH64/VirtHelper.S (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/ARM/VirtHelper.S (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/ARM/VirtHelper.asm (100%) rename ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf => ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf (86%) rename {ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/Virt.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/VirtMem.c (100%) rename ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c => ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c (100%) rename ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf => ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf (80%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf (86%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/BaseCachingPciExpressLib/PciExpressLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf (84%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf (89%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/NorFlashQemuLib/NorFlashQemuLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/NorFlashQemuLib/NorFlashQemuLib.inf (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/IntelBdsPlatform.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/IntelBdsPlatform.h (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/QemuKernel.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformPeiLib/PlatformPeiLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformPeiLib/PlatformPeiLib.inf (79%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/QemuFwCfgLib/QemuFwCfgLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/QemuFwCfgLib/QemuFwCfgLib.inf (84%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/XenRealTimeClockLib/XenRealTimeClockLib.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridge.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridge.h (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridgeDxe.inf (91%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciRootBridgeIo.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/AArch64/ArchPrePi.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/AArch64/ModuleEntryPoint.S (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/ArmVirtPrePiUniCoreRelocatable.inf (90%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/LzmaDecompress.h (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/PrePi.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/PrePi.h (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/Scripts/PrePi-PIE.lds (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/VirtFdtDxe/VirtFdtDxe.c (100%) rename {ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/VirtFdtDxe/VirtFdtDxe.inf (87%) diff --git a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c index df4e113c0e..8df54fdf3c 100644 --- a/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c +++ b/ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c @@ -2,11 +2,11 @@ Support ResetSystem Runtime call using PSCI calls Note: A similar library is implemented in - ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib + ArmVirtPkg/Library/ArmVirtualizationPsciResetSystemLib So similar issues might exist in this implementation too. Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
- Copyright (c) 2013-2014, ARM Ltd. All rights reserved.
+ Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
Copyright (c) 2014, Linaro Ltd. All rights reserved.
This program and the accompanying materials diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc similarity index 93% rename from ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc rename to ArmVirtPkg/ArmVirt.dsc.inc index 2fa0aeba19..51b1079003 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -36,7 +36,7 @@ CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - HobLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf + HobLib|ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf @@ -76,15 +76,15 @@ ArmHvcLib|ArmPkg/Library/ArmHvcLib/ArmHvcLib.inf ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf - PlatformPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf - MemoryInitPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf - EfiResetSystemLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf + PlatformPeiLib|ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf + MemoryInitPeiLib|ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf + EfiResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf # ARM PL031 RTC Driver RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf # ARM PL011 UART Driver PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf - SerialPortLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf + SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf SerialPortExtLib|EmbeddedPkg/Library/SerialPortExtLibNull/SerialPortExtLibNull.inf # @@ -106,7 +106,7 @@ # PCI Libraries PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf - PciExpressLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf + PciExpressLib|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf # USB Libraries UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf @@ -133,7 +133,7 @@ DebugAgentLib|ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLibBase.inf - SerialPortLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf + SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf PeiServicesTablePointerLib|ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf @@ -154,7 +154,7 @@ ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf PeiServicesTablePointerLib|ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf - SerialPortLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf + SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf [LibraryClasses.common.PEIM] PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf @@ -172,7 +172,7 @@ ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf PeiServicesTablePointerLib|ArmPlatformPkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf - SerialPortLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf + SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec similarity index 80% rename from ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec rename to ArmVirtPkg/ArmVirtPkg.dec index 791b45bf50..7bbd9fff57 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec +++ b/ArmVirtPkg/ArmVirtPkg.dec @@ -14,7 +14,7 @@ [Defines] DEC_SPECIFICATION = 0x00010005 - PACKAGE_NAME = ArmVirtualizationPkg + PACKAGE_NAME = ArmVirtPkg PACKAGE_GUID = A0B31216-508E-4025-BEAB-56D836C66F0A PACKAGE_VERSION = 0.1 @@ -31,7 +31,7 @@ Include # Root include for the package [Guids.common] - gArmVirtualizationTokenSpaceGuid = { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E, 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } } + gArmVirtTokenSpaceGuid = { 0x0B6F5CA7, 0x4F53, 0x445A, { 0xB7, 0x6E, 0x2E, 0x36, 0x5B, 0x80, 0x63, 0x66 } } gEarlyPL011BaseAddressGuid = { 0xB199DEA9, 0xFD5C, 0x4A84, { 0x80, 0x82, 0x2F, 0x41, 0x70, 0x78, 0x03, 0x05 } } [PcdsFixedAtBuild, PcdsPatchableInModule] @@ -41,13 +41,13 @@ # can do a first pass over the device tree in the SEC phase to discover the # UART base address. # - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|0x00000001 + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0|UINT64|0x00000001 # # Padding in bytes to add to the device tree allocation, so that the DTB can # be modified in place (default: 256 bytes) # - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeAllocationPadding|256|UINT32|0x00000002 + gArmVirtTokenSpaceGuid.PcdDeviceTreeAllocationPadding|256|UINT32|0x00000002 [PcdsDynamic, PcdsFixedAtBuild] # @@ -56,10 +56,10 @@ # PcdArmPsciMethod == 1 : use HVC # PcdArmPsciMethod == 2 : use SMC # - gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0|UINT32|0x00000003 + gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0|UINT32|0x00000003 - gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004 - gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005 + gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0|UINT64|0x00000004 + gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0|UINT64|0x00000005 [PcdsFeatureFlag] # @@ -84,4 +84,4 @@ # # The default is to turn off the kludge; DSC's can selectively enable it. # - gArmVirtualizationTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|FALSE|BOOLEAN|0x00000006 + gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|FALSE|BOOLEAN|0x00000006 diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc similarity index 87% rename from ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc rename to ArmVirtPkg/ArmVirtQemu.dsc index 4ce27f9119..374cf7a9ee 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # This program and the accompanying materials @@ -18,15 +18,15 @@ # ################################################################################ [Defines] - PLATFORM_NAME = ArmVirtualizationQemu + PLATFORM_NAME = ArmVirtQemu PLATFORM_GUID = 37d7e986-f7e9-45c2-8067-e371421a626c PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = Build/ArmVirtualizationQemu-$(ARCH) + OUTPUT_DIRECTORY = Build/ArmVirtQemu-$(ARCH) SUPPORTED_ARCHITECTURES = AARCH64|ARM BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf + FLASH_DEFINITION = ArmVirtPkg/ArmVirtQemu.fdf # # Defines for default states. These can be changed on the command line. @@ -34,7 +34,7 @@ # DEFINE SECURE_BOOT_ENABLE = FALSE -!include ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc +!include ArmVirtPkg/ArmVirt.dsc.inc [LibraryClasses.AARCH64] ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf @@ -48,18 +48,18 @@ # Virtio Support VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf - QemuFwCfgLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf - ArmPlatformLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf + ArmPlatformLib|ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf - NorFlashPlatformLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf + NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf !ifdef INTEL_BDS CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf - PlatformBdsLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf + PlatformBdsLib|ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf !endif @@ -74,9 +74,9 @@ ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf [BuildOptions] - RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include - GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include - *_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include + RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include + GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include + *_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include ################################################################################ @@ -95,7 +95,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE # Activate KVM workaround for now. - gArmVirtualizationTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE + gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"QEMU" @@ -160,7 +160,7 @@ gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 # initial location of the device tree blob passed by QEMU -- base of DRAM - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000 !ifdef INTEL_BDS gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE @@ -205,10 +205,10 @@ gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 - gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0 + gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0 - gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 - gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress|0x0 + gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 + gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 # # Set video resolution for boot options and for text setup. @@ -308,7 +308,7 @@ # # Platform Driver # - ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf + ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf @@ -347,7 +347,7 @@ # # PCI support # - ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf + ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf similarity index 95% rename from ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf rename to ArmVirtPkg/ArmVirtQemu.fdf index 33cb495222..73d088a3bb 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf +++ b/ArmVirtPkg/ArmVirtQemu.fdf @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # This program and the accompanying materials @@ -102,11 +102,11 @@ READ_LOCK_STATUS = TRUE APRIORI DXE { INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf + INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf } INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf + INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) @@ -209,7 +209,7 @@ READ_LOCK_STATUS = TRUE # # PCI support # - INF ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf + INF ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc similarity index 85% rename from ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc rename to ArmVirtPkg/ArmVirtXen.dsc index 20233e606f..3a53debedd 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2013, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # This program and the accompanying materials @@ -18,21 +18,21 @@ # ################################################################################ [Defines] - PLATFORM_NAME = ArmVirtualizationXen + PLATFORM_NAME = ArmVirtXen PLATFORM_GUID = d1c43be3-3373-4a06-86fb-d1cb3083a207 PLATFORM_VERSION = 0.1 DSC_SPECIFICATION = 0x00010005 - OUTPUT_DIRECTORY = Build/ArmVirtualizationXen-$(ARCH) + OUTPUT_DIRECTORY = Build/ArmVirtXen-$(ARCH) SUPPORTED_ARCHITECTURES = AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT - FLASH_DEFINITION = ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf + FLASH_DEFINITION = ArmVirtPkg/ArmVirtXen.fdf -!include ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc +!include ArmVirtPkg/ArmVirt.dsc.inc [LibraryClasses] SerialPortLib|OvmfPkg/Library/XenConsoleSerialPortLib/XenConsoleSerialPortLib.inf - RealTimeClockLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf + RealTimeClockLib|ArmVirtPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf [LibraryClasses.AARCH64] @@ -48,7 +48,7 @@ VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf - ArmPlatformLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf + ArmPlatformLib|ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf @@ -68,9 +68,9 @@ ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf [BuildOptions] - RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include - GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include - GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include + RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmVirtPkg/Include + GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include + GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include ################################################################################ # @@ -106,7 +106,7 @@ # gArmTokenSpaceGuid.PcdSystemMemoryBase|0x0 gArmTokenSpaceGuid.PcdSystemMemorySize|0x0 - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x0 gArmTokenSpaceGuid.PcdFdBaseAddress|0x0 gArmTokenSpaceGuid.PcdFvBaseAddress|0x0 @@ -140,10 +140,10 @@ gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0 - gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 - gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress|0x0 + gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0 + gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0 - gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0 + gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0 gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 @@ -156,7 +156,7 @@ # # PEI Phase modules # - ArmPlatformPkg/ArmVirtualizationPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf { + ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf { ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf @@ -206,7 +206,7 @@ # # Platform Driver # - ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf + ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf # # FAT filesystem + GPT/MBR partitioning diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf similarity index 94% rename from ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf rename to ArmVirtPkg/ArmVirtXen.fdf index 270a14c550..f98772b719 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2013, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # This program and the accompanying materials @@ -107,11 +107,11 @@ READ_LOCK_STATUS = TRUE APRIORI DXE { INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf + INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf } INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf + INF ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) @@ -182,7 +182,7 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE - INF ArmPlatformPkg/ArmVirtualizationPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf + INF ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 { SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE { diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Include/ArmPlatform.h b/ArmVirtPkg/Include/ArmPlatform.h similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Include/ArmPlatform.h rename to ArmVirtPkg/Include/ArmPlatform.h diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Include/Guid/EarlyPL011BaseAddress.h b/ArmVirtPkg/Include/Guid/EarlyPL011BaseAddress.h similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Include/Guid/EarlyPL011BaseAddress.h rename to ArmVirtPkg/Include/Guid/EarlyPL011BaseAddress.h diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf b/ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf similarity index 93% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf rename to ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf index b6a2c00938..2a3df69d77 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf +++ b/ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf @@ -20,7 +20,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = ArmVirtualizationDxeHobLib + BASE_NAME = ArmVirtDxeHobLib FILE_GUID = 3CD90EEC-EBF3-425D-AAE8-B16215AC4F50 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/HobLib.c b/ArmVirtPkg/Library/ArmVirtDxeHobLib/HobLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/HobLib.c rename to ArmVirtPkg/Library/ArmVirtDxeHobLib/HobLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.c b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.c rename to ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf similarity index 95% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf rename to ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf index b8a19c993d..9fba16f90f 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf +++ b/ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf @@ -21,7 +21,7 @@ LIBRARY_CLASS = MemoryInitPeiLib [Sources] - ArmVirtualizationMemoryInitPeiLib.c + ArmVirtMemoryInitPeiLib.c [Packages] MdePkg/MdePkg.dec diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/AARCH64/VirtHelper.S b/ArmVirtPkg/Library/ArmVirtPlatformLib/AARCH64/VirtHelper.S similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/AARCH64/VirtHelper.S rename to ArmVirtPkg/Library/ArmVirtPlatformLib/AARCH64/VirtHelper.S diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ARM/VirtHelper.S b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.S similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ARM/VirtHelper.S rename to ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.S diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ARM/VirtHelper.asm b/ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ARM/VirtHelper.asm rename to ArmVirtPkg/Library/ArmVirtPlatformLib/ARM/VirtHelper.asm diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf b/ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf similarity index 86% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf rename to ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf index 2cff4b62ea..22ee3625c3 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf +++ b/ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf @@ -14,7 +14,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = ArmVirtualizationPlatformLib + BASE_NAME = ArmVirtPlatformLib FILE_GUID = 00214cc1-06d1-45fe-9700-dca5726ad7bf MODULE_TYPE = BASE VERSION_STRING = 1.0 @@ -26,7 +26,7 @@ EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec [LibraryClasses] IoLib @@ -54,7 +54,7 @@ gArmTokenSpaceGuid.PcdSystemMemorySize [FixedPcd] - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress gArmPlatformTokenSpaceGuid.PcdCoreCount gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdArmPrimaryCoreMask diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/Virt.c b/ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/Virt.c rename to ArmVirtPkg/Library/ArmVirtPlatformLib/Virt.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/VirtMem.c b/ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/VirtMem.c rename to ArmVirtPkg/Library/ArmVirtPlatformLib/VirtMem.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c rename to ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf similarity index 80% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf rename to ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf index b63507a33c..86d6104ca2 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = ArmVirtualizationPsciResetSystemLib + BASE_NAME = ArmVirtPsciResetSystemLib FILE_GUID = c81d76ed-66fa-44a3-ac4a-f163120187a9 MODULE_TYPE = BASE VERSION_STRING = 1.0 @@ -24,11 +24,11 @@ CONSTRUCTOR = ArmPsciResetSystemLibConstructor [Sources] - ArmVirtualizationPsciResetSystemLib.c + ArmVirtPsciResetSystemLib.c [Packages] ArmPkg/ArmPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec @@ -39,4 +39,4 @@ ArmHvcLib [Pcd] - gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod + gArmVirtTokenSpaceGuid.PcdArmPsciMethod diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S rename to ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S rename to ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf similarity index 86% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf rename to ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf index 17bb0f9292..1afab21576 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf @@ -1,5 +1,5 @@ #/* @file -# Copyright (c) 2011-2014, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # This program and the accompanying materials @@ -26,7 +26,7 @@ EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec [LibraryClasses] IoLib @@ -46,7 +46,7 @@ gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec [PatchPcd] - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress gArmTokenSpaceGuid.PcdFdBaseAddress gArmTokenSpaceGuid.PcdFvBaseAddress gArmTokenSpaceGuid.PcdSystemMemoryBase diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c rename to ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c rename to ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf b/ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf rename to ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/BaseCachingPciExpressLib/PciExpressLib.c b/ArmVirtPkg/Library/BaseCachingPciExpressLib/PciExpressLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/BaseCachingPciExpressLib/PciExpressLib.c rename to ArmVirtPkg/Library/BaseCachingPciExpressLib/PciExpressLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c rename to ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf similarity index 84% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf rename to ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf index d62f87bc30..fe892791b7 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf +++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf @@ -2,7 +2,7 @@ # # Component description file for EarlyFdtPL011SerialPortLib module # -# Copyright (c) 2011-2012, ARM Ltd. All rights reserved.
+# Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -34,10 +34,10 @@ MdePkg/MdePkg.dec EmbeddedPkg/EmbeddedPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec [FixedPcd] - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c rename to ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf similarity index 89% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf rename to ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf index 9145afa20b..3bacd641f0 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf +++ b/ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf @@ -2,7 +2,7 @@ # # Component description file for PL011SerialPortLib module # -# Copyright (c) 2011-2012, ARM Ltd. All rights reserved.
+# Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -35,7 +35,7 @@ MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec ArmPkg/ArmPkg.dec [FixedPcd] diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c rename to ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf rename to ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c rename to ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h b/ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h rename to ArmVirtPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.h diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf rename to ArmVirtPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/QemuKernel.c b/ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/QemuKernel.c rename to ArmVirtPkg/Library/PlatformIntelBdsLib/QemuKernel.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.c rename to ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf similarity index 79% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf rename to ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf index 4fe0cbae38..7d456ab3e3 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf @@ -1,6 +1,6 @@ #/** @file # -# Copyright (c) 2011-2012, ARM Limited. All rights reserved. +# Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # # This program and the accompanying materials @@ -26,7 +26,7 @@ [Packages] ArmPkg/ArmPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec EmbeddedPkg/EmbeddedPkg.dec @@ -38,11 +38,11 @@ [FixedPcd] gArmTokenSpaceGuid.PcdFvSize - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeAllocationPadding + gArmVirtTokenSpaceGuid.PcdDeviceTreeAllocationPadding [Pcd] gArmTokenSpaceGuid.PcdFvBaseAddress - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress [Guids] gEarlyPL011BaseAddressGuid diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c rename to ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf similarity index 84% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf rename to ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf index 21ab2bf186..42f21f20c0 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf @@ -39,7 +39,7 @@ [Packages] MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec [LibraryClasses] BaseLib @@ -48,5 +48,5 @@ PcdLib [Pcd] - gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress - gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress + gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress + gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c b/ArmVirtPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c rename to ArmVirtPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf b/ArmVirtPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf rename to ArmVirtPkg/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c b/ArmVirtPkg/PciHostBridgeDxe/PciHostBridge.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.c rename to ArmVirtPkg/PciHostBridgeDxe/PciHostBridge.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.h b/ArmVirtPkg/PciHostBridgeDxe/PciHostBridge.h similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridge.h rename to ArmVirtPkg/PciHostBridgeDxe/PciHostBridge.h diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf b/ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf similarity index 91% rename from ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf rename to ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf index ecea088272..6d782582e0 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf +++ b/ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf @@ -24,7 +24,7 @@ [Packages] MdePkg/MdePkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec [LibraryClasses] UefiDriverEntryPoint @@ -62,7 +62,7 @@ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress [FeaturePcd] - gArmVirtualizationTokenSpaceGuid.PcdKludgeMapPciMmioAsCached + gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached [depex] gEfiMetronomeArchProtocolGuid AND diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciRootBridgeIo.c b/ArmVirtPkg/PciHostBridgeDxe/PciRootBridgeIo.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciRootBridgeIo.c rename to ArmVirtPkg/PciHostBridgeDxe/PciRootBridgeIo.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/AArch64/ArchPrePi.c rename to ArmVirtPkg/PrePi/AArch64/ArchPrePi.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/AArch64/ModuleEntryPoint.S rename to ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf similarity index 90% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf rename to ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 16023382a6..8a7a67c1b5 100755 --- a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -1,6 +1,6 @@ #/** @file # -# Copyright (c) 2011-2014, ARM Ltd. All rights reserved.
+# Copyright (c) 2011-2015, ARM Ltd. All rights reserved.
# Copyright (c) 2015, Linaro Ltd. All rights reserved.
# # This program and the accompanying materials @@ -34,7 +34,7 @@ EmbeddedPkg/EmbeddedPkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec [LibraryClasses] @@ -101,7 +101,7 @@ [Pcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize - gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress + gArmVirtTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress gArmTokenSpaceGuid.PcdFdBaseAddress gArmTokenSpaceGuid.PcdFvBaseAddress diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/LzmaDecompress.h b/ArmVirtPkg/PrePi/LzmaDecompress.h similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/LzmaDecompress.h rename to ArmVirtPkg/PrePi/LzmaDecompress.h diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/PrePi.c b/ArmVirtPkg/PrePi/PrePi.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/PrePi.c rename to ArmVirtPkg/PrePi/PrePi.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/PrePi.h b/ArmVirtPkg/PrePi/PrePi.h similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/PrePi.h rename to ArmVirtPkg/PrePi/PrePi.h diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/PrePi/Scripts/PrePi-PIE.lds b/ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/PrePi/Scripts/PrePi-PIE.lds rename to ArmVirtPkg/PrePi/Scripts/PrePi-PIE.lds diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c similarity index 100% rename from ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c rename to ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.c diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf similarity index 87% rename from ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf rename to ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf index d830dd131d..3477db039f 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf +++ b/ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf @@ -30,7 +30,7 @@ MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec - ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec + ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec OvmfPkg/OvmfPkg.dec @@ -50,9 +50,9 @@ gFdtHobGuid [Pcd] - gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod - gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress - gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress + gArmVirtTokenSpaceGuid.PcdArmPsciMethod + gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress + gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress gArmTokenSpaceGuid.PcdGicDistributorBase gArmTokenSpaceGuid.PcdGicRedistributorsBase gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase