From eeb9ff9990e67f363fb7ec4ae432a1c88af50339 Mon Sep 17 00:00:00 2001 From: Jeenu Viswambharan Date: Wed, 19 Jul 2017 16:06:27 +0100 Subject: [PATCH] FVP: Remove CCI registers from crash dump The CCI crash dump macros assumes CCI base at build time. Since this can't be the case for CCI on FVP, choose not to register dump CCI registers for FVP. Change-Id: I7374a037e7fd0a85b138e84b3cf0aa044262da97 Signed-off-by: Jeenu Viswambharan --- plat/arm/board/fvp/include/plat_macros.S | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/plat/arm/board/fvp/include/plat_macros.S b/plat/arm/board/fvp/include/plat_macros.S index d3d70e45..4dcde2d2 100644 --- a/plat/arm/board/fvp/include/plat_macros.S +++ b/plat/arm/board/fvp/include/plat_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,15 +7,13 @@ #define __PLAT_MACROS_S__ #include -#include #include #include "../fvp_def.h" /* --------------------------------------------- * The below required platform porting macro - * prints out relevant GIC and CCI registers - * whenever an unhandled exception is taken in - * BL31. + * prints out relevant GIC registers whenever an + * unhandled exception is taken in BL31. * Clobbers: x0 - x10, x16, x17, sp * --------------------------------------------- */ @@ -40,9 +38,6 @@ use_ve_mmap: mov_imm x16, VE_GICD_BASE print_gic_regs: arm_print_gic_regs -#if FVP_INTERCONNECT_DRIVER == FVP_CCI - print_cci_regs -#endif .endm #endif /* __PLAT_MACROS_S__ */ -- 2.30.2