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
c163ec45
Commit
c163ec45
authored
10 years ago
by
danh-arm
Browse files
Options
Download
Plain Diff
Merge pull request #303 from danh-arm/dh/fix-fvp-setup-topology
Fix return type of FVP plat_arm_topology_setup
parents
57e56bba
12ad4d88
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
plat/arm/board/fvp/fvp_topology.c
+1
-2
plat/arm/board/fvp/fvp_topology.c
with
1 addition
and
2 deletions
+1
-2
plat/arm/board/fvp/fvp_topology.c
View file @
c163ec45
...
...
@@ -183,7 +183,7 @@ unsigned int plat_get_aff_state(unsigned int aff_lvl,
* the FVP flavour its running on. We construct all the mpidrs we can handle
* and rely on the PWRC.PSYSR to flag absent cpus when their status is queried.
******************************************************************************/
int
plat_arm_topology_setup
(
void
)
void
plat_arm_topology_setup
(
void
)
{
unsigned
char
aff0
,
aff1
,
aff_state
,
aff0_offset
=
0
;
unsigned
long
mpidr
;
...
...
@@ -229,5 +229,4 @@ int plat_arm_topology_setup(void)
fvp_aff1_topology_map
[
aff1
-
1
].
sibling
=
AFFINST_INVAL
;
topology_setup_done
=
1
;
return
0
;
}
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