Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
3679240a
Commit
3679240a
authored
9 years ago
by
danh-arm
Browse files
Options
Download
Plain Diff
Merge pull request #406 from sandrine-bailleux/sb/cci-init-fix-assertion
Fix debug assertion in deprecated CCI-400 driver
parents
6e9fa386
22b0eda5
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
v1.5
v1.5-rc3
v1.5-rc2
v1.5-rc1
v1.5-rc0
v1.4
v1.4-rc0
v1.3
v1.3_rc2
v1.3_rc1
v1.3-rc0
v1.2
v1.2-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
drivers/arm/cci400/cci400.c
+2
-2
drivers/arm/cci400/cci400.c
with
2 additions
and
2 deletions
+2
-2
drivers/arm/cci400/cci400.c
View file @
3679240a
...
...
@@ -48,14 +48,14 @@ void cci_init(uintptr_t cci_base,
/*
* 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
* of them must
be
refer to a valid cluster index.
* of them must refer to a valid cluster index.
*/
assert
(
cci_base
);
assert
(
slave_iface3_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
>=
0
)
||
(
slave_iface
3
_cluster_ix
>=
0
));
(
slave_iface
4
_cluster_ix
>=
0
));
WARN
(
"Please migrate to common cci driver, This driver will be"
\
" deprecated in future
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help