aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorJames Morrissey <james.morrissey@arm.com>2014-02-10 14:24:36 +0000
committerDan Handley <dan.handley@arm.com>2014-02-17 18:51:43 +0000
commit40a6f64795847f2b96ec24e9b11cb7002f0b48bf (patch)
tree114e57eca37970dddbb35e33538f7a75da515ca5 /plat
parentdf64a55b3a675a61b88bb4d0a357ba7085000cdc (diff)
downloadarm-trusted-firmware-40a6f64795847f2b96ec24e9b11cb7002f0b48bf.tar.gz
Fix asserts appearing in release builds
Also fix warnings generated in release builds when assert code is absent. Change-Id: I45b9173d3888f9e93e98eb5b4fdc06727ba5cbf4
Diffstat (limited to 'plat')
-rw-r--r--plat/fvp/aarch64/plat_common.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/plat/fvp/aarch64/plat_common.c b/plat/fvp/aarch64/plat_common.c
index 8568bfe..5b53aaf 100644
--- a/plat/fvp/aarch64/plat_common.c
+++ b/plat/fvp/aarch64/plat_common.c
@@ -35,6 +35,7 @@
#include <bl_common.h>
/* Included only for error codes */
#include <psci.h>
+#include "debug.h"
unsigned char platform_normal_stacks[PLATFORM_STACK_SIZE][PLATFORM_CORE_COUNT]
__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
@@ -534,8 +535,8 @@ int platform_config_setup(void)
bld = (sys_id >> SYS_ID_BLD_SHIFT) & SYS_ID_BLD_MASK;
arch = (sys_id >> SYS_ID_ARCH_SHIFT) & SYS_ID_ARCH_MASK;
- assert(rev == REV_FVP);
- assert(arch == ARCH_MODEL);
+ if ((rev != REV_FVP) || (arch != ARCH_MODEL))
+ panic();
/*
* The build field in the SYS_ID tells which variant of the GIC