aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-05-20 11:32:15 +0100
committerdanh-arm <dan.handley@arm.com>2015-05-20 11:32:15 +0100
commitc163ec455b9f7432a8f677b8d35981e6d11b39cb (patch)
tree5a2a255237c073caf935503d1a27a8f4b163b01c
parent57e56bba34322b8da4f176199418a25bc8ace514 (diff)
parent12ad4d887b9cd99489dc0a40a7bcd236848b4175 (diff)
downloadarm-trusted-firmware-c163ec455b9f7432a8f677b8d35981e6d11b39cb.tar.gz
Merge pull request #303 from danh-arm/dh/fix-fvp-setup-topology
Fix return type of FVP plat_arm_topology_setup
-rw-r--r--plat/arm/board/fvp/fvp_topology.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/plat/arm/board/fvp/fvp_topology.c b/plat/arm/board/fvp/fvp_topology.c
index 168864a..c90e82f 100644
--- a/plat/arm/board/fvp/fvp_topology.c
+++ b/plat/arm/board/fvp/fvp_topology.c
@@ -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;
}