Revision: 17837
http://sourceforge.net/p/edk2/code/17837
Author: abiesheuvel
Date: 2015-07-06 22:09:02 +0000 (Mon, 06 Jul 2015)
Log Message:
-----------
ArmVirtPkg: adapt ArmVirtXen build to system memory end global variable
This fixes the ArmVirtXen build that was broken by r17835, which adds
a global variable mSystemMemoryEnd which is shared between a module
and a library it depends on.
Add the same global variable to the relocatable PrePi used by ArmVirtXen.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
Acked-by: Laszlo Ersek <ler...@redhat.com>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/17835
Modified Paths:
--------------
trunk/edk2/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
trunk/edk2/ArmVirtPkg/PrePi/PrePi.h
Modified: trunk/edk2/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
===================================================================
--- trunk/edk2/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S 2015-07-06
17:00:40 UTC (rev 17836)
+++ trunk/edk2/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S 2015-07-06
22:09:02 UTC (rev 17837)
@@ -25,8 +25,10 @@
GCC_ASM_IMPORT(ArmPlatformPeiBootAction)
GCC_ASM_IMPORT(ArmPlatformStackSet)
GCC_ASM_EXPORT(_ModuleEntryPoint)
+GCC_ASM_EXPORT(mSystemMemoryEnd)
StartupAddr: .8byte ASM_PFX(CEntryPoint)
+mSystemMemoryEnd: .8byte 0
ASM_PFX(_ModuleEntryPoint):
//
@@ -80,6 +82,8 @@
ldr x2, PcdGet64 (PcdSystemMemorySize)
sub x2, x2, #1
add x1, x1, x2 // x1 = SystemMemoryTop = PcdSystemMemoryBase +
PcdSystemMemorySize
+ adr x2, mSystemMemoryEnd
+ str x1, [x2]
// Calculate Top of the Firmware Device
ldr x2, PcdGet64 (PcdFdBaseAddress)
Modified: trunk/edk2/ArmVirtPkg/PrePi/PrePi.h
===================================================================
--- trunk/edk2/ArmVirtPkg/PrePi/PrePi.h 2015-07-06 17:00:40 UTC (rev 17836)
+++ trunk/edk2/ArmVirtPkg/PrePi/PrePi.h 2015-07-06 22:09:02 UTC (rev 17837)
@@ -29,6 +29,8 @@
#define SerialPrint(txt) SerialPortWrite (txt, AsciiStrLen(txt)+1);
+extern UINT64 mSystemMemoryEnd;
+
RETURN_STATUS
EFIAPI
TimerConstructor (
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits
