[edk2] [PATCH 0/2] Moved ArmVirtualizationPkg and introduced two mainainers

Added Laszlo Ersek and Ard Biesheuvel as maintainers
for ArmVirtPkg.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <***@arm.com>
---
Maintainers.txt | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/Maintainers.txt b/Maintainers.txt
index 1ec28e8..160decd 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -58,6 +58,11 @@ ArmPlatformPkg
W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
M: Olivier Martin <***@arm.com>

+ArmVirtPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
+M: Laszlo Ersek <***@redhat.com>
+M: Ard Biesheuvel <***@linaro.org>
+
BaseTools
W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
M: Yingke D Liu <***@intel.com>

--
2.1.1

------------------------------------------------------------------------------

Ard Biesheuvel

2015-05-28 16:01:04 UTC

Post by Olivier Martin
Added Laszlo Ersek and Ard Biesheuvel as maintainers
for ArmVirtPkg.
Contributed-under: TianoCore Contribution Agreement 1.0

Thanks for the confidence.

Reviewed-by: Ard Biesheuvel <***@linaro.org>

The wiki page doesn't exist yet (obviously), but the link also does
not redirect to an empty placeholder page.
Who is in charge of assigning edit permissions etc?

Post by Olivier Martin
---
Maintainers.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Maintainers.txt b/Maintainers.txt
index 1ec28e8..160decd 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -58,6 +58,11 @@ ArmPlatformPkg
W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
+ArmVirtPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
+
BaseTools
W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
--
2.1.1

------------------------------------------------------------------------------

Laszlo Ersek

2015-05-28 16:27:37 UTC

Post by Olivier Martin
Added Laszlo Ersek and Ard Biesheuvel as maintainers
for ArmVirtPkg.
Contributed-under: TianoCore Contribution Agreement 1.0

Thanks for the confidence.

Ditto, thank you very much Olivier.

Post by Ard Biesheuvel
The wiki page doesn't exist yet (obviously), but the link also does
not redirect to an empty placeholder page.
Who is in charge of assigning edit permissions etc?

I think when I received permission to edit wiki pages (still in the old
sf.net wiki), that was granted by Jordan.

... Not that I could find the time to edit wiki pages, now or then. :(

In any case, now that the wiki is on github, the needed credentials &
the granting process might have changed, I'm not sure.

Thanks
Laszlo

------------------------------------------------------------------------------

Laszlo Ersek

2015-05-28 22:35:05 UTC

Post by Olivier Martin
Added Laszlo Ersek and Ard Biesheuvel as maintainers
for ArmVirtPkg.
Contributed-under: TianoCore Contribution Agreement 1.0

Thanks for the confidence.
The wiki page doesn't exist yet (obviously), but the link also does
not redirect to an empty placeholder page.

I pushed an initial, minimal, article.

Thanks
Laszlo

Post by Ard Biesheuvel
Who is in charge of assigning edit permissions etc?

------------------------------------------------------------------------------

Ard Biesheuvel

2015-05-29 06:34:27 UTC

Post by Olivier Martin
Added Laszlo Ersek and Ard Biesheuvel as maintainers
for ArmVirtPkg.
Contributed-under: TianoCore Contribution Agreement 1.0

Thanks for the confidence.
The wiki page doesn't exist yet (obviously), but the link also does
not redirect to an empty placeholder page.

I pushed an initial, minimal, article.

That looks fine, thanks. IMO there is not necessarily a need to
inflate it with duplicated info from the Linaro wiki.

Thanks,
Ard.

Post by Ard Biesheuvel
Who is in charge of assigning edit permissions etc?

------------------------------------------------------------------------------

Olivier Martin

2015-05-29 10:46:22 UTC

My plan is actually to move all the ARM related wikipages from sourceforge wiki to EDK2 SVN repository using the markdown format (http://en.wikipedia.org/wiki/Markdown).

The idea is:
- Avoid to duplicate information (we could potentially merge the Sourceforge wiki, Linaro wiki and other sources)
- Easy to write & maintain
- everyone can contribute. They only need to send a patch for the documentation
- Forcing the documentation by rejecting a patch because it would require some documentation.

-----Original Message-----
From: Ard Biesheuvel [mailto:***@linaro.org]
Sent: 29 May 2015 07:34
To: Laszlo Ersek
Cc: Olivier Martin; edk2-***@lists.sourceforge.net
Subject: Re: [PATCH 2/2] Maintainers.txt: Assigned new maintainers for ArmVirtPkg

Added Laszlo Ersek and Ard Biesheuvel as maintainers for ArmVirtPkg.
Contributed-under: TianoCore Contribution Agreement 1.0

Thanks for the confidence.
The wiki page doesn't exist yet (obviously), but the link also does
not redirect to an empty placeholder page.

I pushed an initial, minimal, article.

That looks fine, thanks. IMO there is not necessarily a need to inflate it with duplicated info from the Linaro wiki.

Thanks,
Ard.

Post by Ard Biesheuvel
Who is in charge of assigning edit permissions etc?

---
Maintainers.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Maintainers.txt b/Maintainers.txt index
1ec28e8..160decd 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -58,6 +58,11 @@ ArmPlatformPkg
https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg
+ArmVirtPkg
+W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg
+
BaseTools
W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
--
2.1.1

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590
ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782
------------------------------------------------------------------------------

Ard Biesheuvel

2015-05-28 15:58:03 UTC

Post by Olivier Martin
Contributed-under: TianoCore Contribution Agreement 1.0

Could you please regenerate this diff after setting [diff]
renames=true in .git/config?
And perhaps add --stat=200 so we can read the full path names?

------------------------------------------------------------------------------

Laszlo Ersek

2015-05-28 16:43:59 UTC

Post by Olivier Martin
Contributed-under: TianoCore Contribution Agreement 1.0

Could you please regenerate this diff after setting [diff]
renames=true in .git/config?
And perhaps add --stat=200 so we can read the full path names?

In fact edk2 patches can be applied from the mailing list too, with a
number of tricks:

(1) In the receiving git repo, add the following settings:

[core]
whitespace = cr-at-eol
[am]
keepcr = true

(2) Save the patch email from your MUA to a regular file. The file
should be a pristine copy of the email.

(3) At this point you can directly apply patches with "git am" *if* the
patches do not contain /dev/null headers -- which is equivalent to
saying that the patches neither create nor remove files. This somewhat
unfortunate restriction exists because git does not consider the
"am.keepcr" setting when it comes to /dev/null headers, and the \r after
the /dev/null string trips it up; the patch will be rejected.

In this particular example (where a bunch of files are renamed) we have
a great number of such /dev/null\r headers, so the following processing
is required, in order to strip the \r's:

sed -r 's,^((---|\+\+\+) /dev/null)\r$,\1,'

(4) The output of the above sed command can be applied with git-am, and
then reformatted as a patch any way you'd like.

I'll repost Olivier's patch as a followup to this message, reformatted
as described above.

Thanks
Laszlo

------------------------------------------------------------------------------

Laszlo Ersek

2015-05-28 16:51:06 UTC

From: Olivier Martin <***@arm.com>

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <***@arm.com>
Cc: Olivier Martin <***@arm.com>
Cc: Ard Biesheuvel <***@linaro.org>
[***@redhat.com: no changes other than adding Cc's]
Signed-off-by: Laszlo Ersek <***@redhat.com>

Signed-off-by: Laszlo Ersek <***@redhat.com>
---
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc => ArmVirtPkg/ArmVirt.dsc.inc | 18 +++++-----
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec => ArmVirtPkg/ArmVirtPkg.dec | 16 ++++-----
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc => ArmVirtPkg/ArmVirtQemu.dsc | 38 ++++++++++----------
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf => ArmVirtPkg/ArmVirtQemu.fdf | 8 ++---
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc => ArmVirtPkg/ArmVirtXen.dsc | 32 ++++++++---------
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf => ArmVirtPkg/ArmVirtXen.fdf | 8 ++---
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Include/ArmPlatform.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Include/Guid/EarlyPL011BaseAddress.h | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf => ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf | 2 +-
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib => ArmVirtPkg/Library/ArmVirtDxeHobLib}/HobLib.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.c => ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf => ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf | 2 +-
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/AARCH64/VirtHelper.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/ARM/VirtHelper.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/ARM/VirtHelper.asm | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf => ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/Virt.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/VirtMem.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c => ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf => ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf | 8 ++---
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/BaseCachingPciExpressLib/PciExpressLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf | 4 +--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/NorFlashQemuLib/NorFlashQemuLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/NorFlashQemuLib/NorFlashQemuLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/IntelBdsPlatform.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/QemuKernel.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformPeiLib/PlatformPeiLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformPeiLib/PlatformPeiLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/QemuFwCfgLib/QemuFwCfgLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/XenRealTimeClockLib/XenRealTimeClockLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridge.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridge.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridgeDxe.inf | 4 +--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciRootBridgeIo.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/AArch64/ArchPrePi.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/AArch64/ModuleEntryPoint.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/LzmaDecompress.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/PrePi.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/PrePi.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/Scripts/PrePi-PIE.lds | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/VirtFdtDxe/VirtFdtDxe.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/VirtFdtDxe/VirtFdtDxe.inf | 8 ++---
56 files changed, 92 insertions(+), 92 deletions(-)

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 2fa0aeb..51b1079 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 791b45b..7bbd9ff 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 4ce27f9..374cf7a 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 33cb495..73d088a 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 20233e6..3a53deb 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 {
<LibraryClasses>
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 270a14c..f98772b 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 b6a2c00..2a3df69 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 b8a19c9..9fba16f 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 2cff4b6..22ee362 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 b63507a..86d6104 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 17bb0f9..1afab21 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 d62f87b..fe89279 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 9145afa..3bacd64 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 83%
rename from ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
rename to ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
index 4fe0cba..652f6a4 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
+++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
@@ -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 21ab2bf..42f21f2 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 ecea088..6d78258 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 1602338..8a7a67c 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 d830dd1..3477db0 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

--
1.8.3.1

------------------------------------------------------------------------------

Laszlo Ersek

2015-05-28 17:53:23 UTC

Post by Olivier Martin
Contributed-under: TianoCore Contribution Agreement 1.0
---

Okay, so I'm reviewing this because I reposted Olivier's patch without
any changes (modulo the different formatting requested from
git-format-patch).

... The diffstat just below is already good justification for this rename :)

Anyway, first of all, after applying this patch, I grepped the tree for
the string "ArmVirtualization", and I got one hit in
"ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.c".

Normally that reference should be updated too, but it's just in a
comment in a C source file, and the correct (new) place can be figured
out easily, so there's no need to update this patch just for that.

(In passing I'll note that such issues -- although it's not a real issue
in this case -- can not be caught without actually *applying* the patch
for review. So this is another argument for the parallel discussion: a
web app would not be a step forward over email, because one really needs
to run "git grep" locally.)

Anyway, back to this patch.

I checked

git ls-files | grep ArmVirtualization

too, no hits; good.

Post by Olivier Martin
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc => ArmVirtPkg/ArmVirt.dsc.inc | 18 +++++-----
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationPkg.dec => ArmVirtPkg/ArmVirtPkg.dec | 16 ++++-----
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc => ArmVirtPkg/ArmVirtQemu.dsc | 38 ++++++++++----------
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.fdf => ArmVirtPkg/ArmVirtQemu.fdf | 8 ++---
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc => ArmVirtPkg/ArmVirtXen.dsc | 32 ++++++++---------
ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.fdf => ArmVirtPkg/ArmVirtXen.fdf | 8 ++---
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Include/ArmPlatform.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Include/Guid/EarlyPL011BaseAddress.h | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib/ArmVirtualizationDxeHobLib.inf => ArmVirtPkg/Library/ArmVirtDxeHobLib/ArmVirtDxeHobLib.inf | 2 +-
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationDxeHobLib => ArmVirtPkg/Library/ArmVirtDxeHobLib}/HobLib.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.c => ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf => ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf | 2 +-
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/AARCH64/VirtHelper.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/ARM/VirtHelper.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/ARM/VirtHelper.asm | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf => ArmVirtPkg/Library/ArmVirtPlatformLib/ArmVirtPlatformLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/Virt.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib => ArmVirtPkg/Library/ArmVirtPlatformLib}/VirtMem.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.c => ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c | 0
ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf => ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf | 8 ++---
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/AARCH64/MemnodeParser.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/ArmXenRelocatablePlatformLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/RelocatableVirt.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/ArmXenRelocatablePlatformLib/XenVirtMem.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/BaseCachingPciExpressLib/PciExpressLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/EarlyFdtPL011SerialPortLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf | 4 +--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/NorFlashQemuLib/NorFlashQemuLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/NorFlashQemuLib/NorFlashQemuLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/IntelBdsPlatform.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformIntelBdsLib/QemuKernel.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformPeiLib/PlatformPeiLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/PlatformPeiLib/PlatformPeiLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/QemuFwCfgLib/QemuFwCfgLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/XenRealTimeClockLib/XenRealTimeClockLib.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/Library/XenRealTimeClockLib/XenRealTimeClockLib.inf | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridge.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridge.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciHostBridgeDxe.inf | 4 +--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PciHostBridgeDxe/PciRootBridgeIo.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/AArch64/ArchPrePi.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/AArch64/ModuleEntryPoint.S | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 6 ++--
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/LzmaDecompress.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/PrePi.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/PrePi.h | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/PrePi/Scripts/PrePi-PIE.lds | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/VirtFdtDxe/VirtFdtDxe.c | 0
{ArmPlatformPkg/ArmVirtualizationPkg => ArmVirtPkg}/VirtFdtDxe/VirtFdtDxe.inf | 8 ++---
56 files changed, 92 insertions(+), 92 deletions(-)

The renames implied by the diffstat look good. I copied the diffstat to
a text editor, performed the following replacements:

ArmPlatformPkg/ArmVirtualizationPkg --> ArmVirtPkg
ArmVirtualization --> ArmVirt

and verified if the left side of each { => } matched the right side
then. They all did, so this is fine.

[snip]

I validated the source code hunks in the patch practically the same way
-- performed the above replacements on the patch itself, and confirmed
that the - lines matched the + lines.

Okay.

Okay.

[snip]

The patch looks good. Let me see if it builds:

- ArmVirtXen: builds (I didn't run it)
- ArmVirtQemu: builds (I didn't run it)
- ArmVirtQemu, with -D INTEL_BDS: builds, and runs too

Reviewed-by: Laszlo Ersek <***@redhat.com>
Tested-by: Laszlo Ersek <***@redhat.com>

Thanks!
Laszlo

------------------------------------------------------------------------------

Laszlo Ersek

2015-05-28 20:47:11 UTC