diff options
Diffstat (limited to 'drivers/arm/cci/cci.c')
| -rw-r--r-- | drivers/arm/cci/cci.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index 2e773a98..0fcec850 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; @@ -54,26 +54,25 @@ static int validate_cci_map(const int *map) continue; if (slave_if_id >= CCI_SLAVE_INTERFACE_COUNT) { - tf_printf("Slave interface ID is invalid\n"); + ERROR("Slave interface ID is invalid\n"); return 0; } if (valid_cci_map & (1 << slave_if_id)) { - tf_printf("Multiple masters are assigned same" - " slave interface ID\n"); + ERROR("Multiple masters are assigned same slave interface ID\n"); return 0; } valid_cci_map |= 1 << slave_if_id; } if (!valid_cci_map) { - tf_printf("No master is assigned a valid slave interface\n"); + ERROR("No master is assigned a valid slave interface\n"); return 0; } return 1; } -#endif /* DEBUG */ +#endif /* ENABLE_ASSERTIONS */ void cci_init(uintptr_t cci_base, const int *map, |