Commit 3679240a authored by danh-arm's avatar danh-arm
Browse files

Merge pull request #406 from sandrine-bailleux/sb/cci-init-fix-assertion

Fix debug assertion in deprecated CCI-400 driver
parents 6e9fa386 22b0eda5
...@@ -48,14 +48,14 @@ void cci_init(uintptr_t cci_base, ...@@ -48,14 +48,14 @@ void cci_init(uintptr_t cci_base,
/* /*
* Check the passed arguments are valid. The cluster indices must be * Check the passed arguments are valid. The cluster indices must be
* less than MAX_CLUSTERS, not the same as each other and at least one * less than MAX_CLUSTERS, not the same as each other and at least one
* of them must be refer to a valid cluster index. * of them must refer to a valid cluster index.
*/ */
assert(cci_base); assert(cci_base);
assert(slave_iface3_cluster_ix < MAX_CLUSTERS); assert(slave_iface3_cluster_ix < MAX_CLUSTERS);
assert(slave_iface4_cluster_ix < MAX_CLUSTERS); assert(slave_iface4_cluster_ix < MAX_CLUSTERS);
assert(slave_iface3_cluster_ix != slave_iface4_cluster_ix); assert(slave_iface3_cluster_ix != slave_iface4_cluster_ix);
assert((slave_iface3_cluster_ix >= 0) || assert((slave_iface3_cluster_ix >= 0) ||
(slave_iface3_cluster_ix >= 0)); (slave_iface4_cluster_ix >= 0));
WARN("Please migrate to common cci driver, This driver will be" \ WARN("Please migrate to common cci driver, This driver will be" \
" deprecated in future\n"); " deprecated in future\n");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment