From 5b7436987177fd35ab8c8fc9f69d743f0a577813 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Sat, 24 Aug 2019 17:36:32 +0100 Subject: [PATCH] amlogic: Move platform macros assembly file to common directory The platform macros are shared between all the SoCs. Move it to common directory. Signed-off-by: Carlo Caione Change-Id: Ia04c3ffe4d7b068aa701268ed99f69995d8db92b --- .../{gxbb => common}/include/plat_macros.S | 0 plat/amlogic/gxl/include/plat_macros.S | 71 ------------------- 2 files changed, 71 deletions(-) rename plat/amlogic/{gxbb => common}/include/plat_macros.S (100%) delete mode 100644 plat/amlogic/gxl/include/plat_macros.S diff --git a/plat/amlogic/gxbb/include/plat_macros.S b/plat/amlogic/common/include/plat_macros.S similarity index 100% rename from plat/amlogic/gxbb/include/plat_macros.S rename to plat/amlogic/common/include/plat_macros.S diff --git a/plat/amlogic/gxl/include/plat_macros.S b/plat/amlogic/gxl/include/plat_macros.S deleted file mode 100644 index c721c21b..00000000 --- a/plat/amlogic/gxl/include/plat_macros.S +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef PLAT_MACROS_S -#define PLAT_MACROS_S - -#include -#include - -.section .rodata.gic_reg_name, "aS" - -gicc_regs: - .asciz "gicc_hppir", "gicc_ahppir", "gicc_ctlr", "" -gicd_pend_reg: - .asciz "gicd_ispendr regs (Offsets 0x200 - 0x278)\n Offset:\t\t\tvalue\n" -newline: - .asciz "\n" -spacer: - .asciz ":\t\t0x" - - /* --------------------------------------------- - * The below required platform porting macro - * prints out relevant GIC and CCI registers - * whenever an unhandled exception is taken in - * BL31. - * Clobbers: x0 - x10, x16, x17, sp - * --------------------------------------------- - */ - .macro plat_crash_print_regs - - /* GICC registers */ - - mov_imm x17, GXBB_GICC_BASE - - adr x6, gicc_regs - ldr w8, [x17, #GICC_HPPIR] - ldr w9, [x17, #GICC_AHPPIR] - ldr w10, [x17, #GICC_CTLR] - bl str_in_crash_buf_print - - /* GICD registers */ - - mov_imm x16, GXBB_GICD_BASE - - add x7, x16, #GICD_ISPENDR - adr x4, gicd_pend_reg - bl asm_print_str - -gicd_ispendr_loop: - sub x4, x7, x16 - cmp x4, #0x280 - b.eq exit_print_gic_regs - bl asm_print_hex - - adr x4, spacer - bl asm_print_str - - ldr x4, [x7], #8 - bl asm_print_hex - - adr x4, newline - bl asm_print_str - b gicd_ispendr_loop -exit_print_gic_regs: - - .endm - -#endif /* PLAT_MACROS_S */ -- 2.30.2