commit 043f8469125009c45892e1e29d213f08771c99b2
author danh-arm <dan.handley@arm.com> Tue Jun 24 16:48:18 2014 +0100
committer danh-arm <dan.handley@arm.com> Tue Jun 24 16:48:18 2014 +0100
tree 35c6ebca3e0d0e888f0cb35f05b0f462a0817f53
parent 94ac0d8a522128608936bcde4c935066d1299b42
parent 21aa52020abe69ae5df03bf0b7a8f30080c5462c

Merge pull request #150 from sandrine-bailleux/sb/fix-plat-print-gic-regs

fvp: Fix register name in 'plat_print_gic_regs' macro

plat/fvp/include/plat_macros.S

diff --git a/plat/fvp/include/plat_macros.S b/plat/fvp/include/plat_macros.S
index bdd402d..d2e7cbc 100644
--- a/plat/fvp/include/plat_macros.S
+++ b/plat/fvp/include/plat_macros.S
@@ -47,7 +47,7 @@
 	bl	fvp_get_cfgvar
 	/* gic base address is now in x0 */
 	ldr	w1, [x0, #GICC_IAR]
-	ldr	w2, [x0, #GICD_CTLR]
+	ldr	w2, [x0, #GICC_CTLR]
 	sub	sp, sp, #GIC_REG_SIZE
 	stp	x1, x2, [sp] /* we store the gic registers as 64 bit */
 	adr	x0, gic_regs