summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Martin <olivier.martin@arm.com>2014-02-05 12:53:09 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2014-02-05 12:53:09 +0000
commit4e57d6d70b836dc5888603b9c0c7c00177e3d063 (patch)
tree0cb4f84bd09c8bd6c8337bc52eb4f009fd87fbc4
parent2818c158de6a164d012e6afb0fc145656aed4e4b (diff)
downloadedk2-platforms-4e57d6d70b836dc5888603b9c0c7c00177e3d063.tar.xz
ArmPkg/ArmLib: VBAR_ELx not written correctly when handler above 4GB
The function ArmWriteVBar had a UINT32 parameter. Need to change it to UINT. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15208 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--ArmPkg/Include/Library/ArmLib.h6
-rw-r--r--ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index a05f7251a1..b874b29c67 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -1,7 +1,7 @@
/** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
- Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2011 - 2014, ARM Ltd. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -477,10 +477,10 @@ ArmInstructionSynchronizationBarrier (
VOID
EFIAPI
ArmWriteVBar (
- IN UINT32 VectorBase
+ IN UINTN VectorBase
);
-UINT32
+UINTN
EFIAPI
ArmReadVBar (
VOID
diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
index c512c03557..1f353d477f 100644
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Lib.c
@@ -1,7 +1,7 @@
/** @file
Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
- Copyright (c) 2011, ARM Limited. All rights reserved.
+ Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
@@ -22,7 +22,7 @@
VOID
EFIAPI
ArmWriteVBar (
- IN UINT32 VectorBase
+ IN UINTN VectorBase
)
{
ASSERT(FeaturePcdGet (PcdRelocateVectorTable) == TRUE);
@@ -37,7 +37,7 @@ ArmWriteVBar (
}
}
-UINT32
+UINTN
EFIAPI
ArmReadVBar (
VOID