diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2017-03-22 15:48:51 +0000 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2017-04-20 09:59:12 +0100 |
| commit | aa61368eb554e9910c503f78560153805a2d6859 (patch) | |
| tree | ffcdb0f2665acbfebd1d866cefb0724600162ce0 /drivers/arm/cci/cci.c | |
| parent | 044bb2faabd7981af4ef419e1037fec28e5b3f8b (diff) | |
| download | platform_external_arm-trusted-firmware-aa61368eb554e9910c503f78560153805a2d6859.tar.gz platform_external_arm-trusted-firmware-aa61368eb554e9910c503f78560153805a2d6859.tar.bz2 platform_external_arm-trusted-firmware-aa61368eb554e9910c503f78560153805a2d6859.zip | |
Control inclusion of helper code used for asserts
Many asserts depend on code that is conditionally compiled based on the
DEBUG define. This patch modifies the conditional inclusion of such code
so that it is based on the ENABLE_ASSERTIONS build option.
Change-Id: I6406674788aa7e1ad7c23d86ce94482ad3c382bd
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'drivers/arm/cci/cci.c')
| -rw-r--r-- | drivers/arm/cci/cci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index 2e773a98b..dd39051ff 100644 --- a/drivers/arm/cci/cci.c +++ b/drivers/arm/cci/cci.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -39,7 +39,7 @@ static uintptr_t g_cci_base; static unsigned int g_max_master_id; static const int *g_cci_slave_if_map; -#if DEBUG +#if ENABLE_ASSERTIONS static int validate_cci_map(const int *map) { unsigned int valid_cci_map = 0; @@ -73,7 +73,7 @@ static int validate_cci_map(const int *map) return 1; } -#endif /* DEBUG */ +#endif /* ENABLE_ASSERTIONS */ void cci_init(uintptr_t cci_base, const int *map, |