diff options
| author | Carlo Caione <ccaione@baylibre.com> | 2019-08-24 18:51:48 +0100 |
|---|---|---|
| committer | Carlo Caione <ccaione@baylibre.com> | 2019-09-05 10:39:30 +0100 |
| commit | 821781f30e8428c34666603a32351d100862a8d1 (patch) | |
| tree | b9fbb7eb07be2c60943fa253b5846aa68e43908a /plat/amlogic | |
| parent | f681c676df66ffc1afd30948d9d789492e043e99 (diff) | |
amlogic: Fix prefixes in the platform macros file
Fixing at the same time the related register names.
Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: Ib1130d50abe6088f1c0826878d1ae454a0f23008
Diffstat (limited to 'plat/amlogic')
| -rw-r--r-- | plat/amlogic/common/include/plat_macros.S | 6 | ||||
| -rw-r--r-- | plat/amlogic/gxbb/gxbb_bl31_setup.c | 4 | ||||
| -rw-r--r-- | plat/amlogic/gxbb/gxbb_def.h | 4 | ||||
| -rw-r--r-- | plat/amlogic/gxl/gxl_bl31_setup.c | 4 | ||||
| -rw-r--r-- | plat/amlogic/gxl/gxl_def.h | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/plat/amlogic/common/include/plat_macros.S b/plat/amlogic/common/include/plat_macros.S index c721c21b..d620fcfb 100644 --- a/plat/amlogic/common/include/plat_macros.S +++ b/plat/amlogic/common/include/plat_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -33,7 +33,7 @@ spacer: /* GICC registers */ - mov_imm x17, GXBB_GICC_BASE + mov_imm x17, AML_GICC_BASE adr x6, gicc_regs ldr w8, [x17, #GICC_HPPIR] @@ -43,7 +43,7 @@ spacer: /* GICD registers */ - mov_imm x16, GXBB_GICD_BASE + mov_imm x16, AML_GICD_BASE add x7, x16, #GICD_ISPENDR adr x4, gicd_pend_reg diff --git a/plat/amlogic/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c index be23ce3b..e5402c33 100644 --- a/plat/amlogic/gxbb/gxbb_bl31_setup.c +++ b/plat/amlogic/gxbb/gxbb_bl31_setup.c @@ -127,8 +127,8 @@ static const interrupt_prop_t gxbb_interrupt_props[] = { }; static const gicv2_driver_data_t gxbb_gic_data = { - .gicd_base = GXBB_GICD_BASE, - .gicc_base = GXBB_GICC_BASE, + .gicd_base = AML_GICD_BASE, + .gicc_base = AML_GICC_BASE, .interrupt_props = gxbb_interrupt_props, .interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props), }; diff --git a/plat/amlogic/gxbb/gxbb_def.h b/plat/amlogic/gxbb/gxbb_def.h index e43bb1d2..e888aa60 100644 --- a/plat/amlogic/gxbb/gxbb_def.h +++ b/plat/amlogic/gxbb/gxbb_def.h @@ -58,8 +58,8 @@ /******************************************************************************* * GIC-400 and interrupt handling related constants ******************************************************************************/ -#define GXBB_GICD_BASE UL(0xC4301000) -#define GXBB_GICC_BASE UL(0xC4302000) +#define AML_GICD_BASE UL(0xC4301000) +#define AML_GICC_BASE UL(0xC4302000) #define IRQ_SEC_PHY_TIMER 29 diff --git a/plat/amlogic/gxl/gxl_bl31_setup.c b/plat/amlogic/gxl/gxl_bl31_setup.c index ddf43c9e..796f1a0a 100644 --- a/plat/amlogic/gxl/gxl_bl31_setup.c +++ b/plat/amlogic/gxl/gxl_bl31_setup.c @@ -141,8 +141,8 @@ static const interrupt_prop_t gxbb_interrupt_props[] = { }; static const gicv2_driver_data_t gxbb_gic_data = { - .gicd_base = GXBB_GICD_BASE, - .gicc_base = GXBB_GICC_BASE, + .gicd_base = AML_GICD_BASE, + .gicc_base = AML_GICC_BASE, .interrupt_props = gxbb_interrupt_props, .interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props), }; diff --git a/plat/amlogic/gxl/gxl_def.h b/plat/amlogic/gxl/gxl_def.h index ced811d9..3cc7a1c0 100644 --- a/plat/amlogic/gxl/gxl_def.h +++ b/plat/amlogic/gxl/gxl_def.h @@ -62,8 +62,8 @@ /******************************************************************************* * GIC-400 and interrupt handling related constants ******************************************************************************/ -#define GXBB_GICD_BASE UL(0xC4301000) -#define GXBB_GICC_BASE UL(0xC4302000) +#define AML_GICD_BASE UL(0xC4301000) +#define AML_GICC_BASE UL(0xC4302000) #define IRQ_SEC_PHY_TIMER 29 |