From 471e8fa7d17ce2140cbcec7f4f61d2f1749b447f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Wed, 11 Apr 2018 16:09:35 -0700 Subject: [PATCH] trusty: Allow gic base to be specified with GICD_BASE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some platforms define GICD_BASE instead of PLAT_ARM_GICD_BASE but the meaning is the same. Change-Id: I1bb04bb49fdab055b365b1d70a4d48d2058e49df Signed-off-by: Arve Hjønnevåg --- services/spd/trusty/generic-arm64-smcall.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/spd/trusty/generic-arm64-smcall.c b/services/spd/trusty/generic-arm64-smcall.c index dfc3e71b7..3ffc13dcf 100644 --- a/services/spd/trusty/generic-arm64-smcall.c +++ b/services/spd/trusty/generic-arm64-smcall.c @@ -12,6 +12,15 @@ #include "generic-arm64-smcall.h" +#ifndef PLAT_ARM_GICD_BASE +#ifdef GICD_BASE +#define PLAT_ARM_GICD_BASE GICD_BASE +#define PLAT_ARM_GICC_BASE GICC_BASE +#else +#error PLAT_ARM_GICD_BASE or GICD_BASE must be defined +#endif +#endif + int trusty_disable_serial_debug; struct dputc_state {