summaryrefslogtreecommitdiff
path: root/src/soc/cavium
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/cavium')
-rw-r--r--src/soc/cavium/cn81xx/bl31_plat_params.c4
-rw-r--r--src/soc/cavium/cn81xx/include/soc/bl31_plat_params.h2
-rw-r--r--src/soc/cavium/cn81xx/soc.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/soc/cavium/cn81xx/bl31_plat_params.c b/src/soc/cavium/cn81xx/bl31_plat_params.c
index 5002e146bc..661f3efb85 100644
--- a/src/soc/cavium/cn81xx/bl31_plat_params.c
+++ b/src/soc/cavium/cn81xx/bl31_plat_params.c
@@ -20,7 +20,7 @@
static struct bl31_plat_param *plat_params;
-void register_bl31_param(struct bl31_plat_param *param)
+void cn81xx_register_bl31_param(struct bl31_plat_param *param)
{
ASSERT(param);
@@ -28,7 +28,7 @@ void register_bl31_param(struct bl31_plat_param *param)
plat_params = param;
}
-void *soc_get_bl31_plat_params(bl31_params_t *bl31_params)
+void *soc_get_bl31_plat_params(void)
{
return plat_params;
}
diff --git a/src/soc/cavium/cn81xx/include/soc/bl31_plat_params.h b/src/soc/cavium/cn81xx/include/soc/bl31_plat_params.h
index f365aad059..e47de899e4 100644
--- a/src/soc/cavium/cn81xx/include/soc/bl31_plat_params.h
+++ b/src/soc/cavium/cn81xx/include/soc/bl31_plat_params.h
@@ -19,6 +19,6 @@
#include <atf/plat_params.h>
-void register_bl31_param(struct bl31_plat_param *param);
+void cn81xx_register_bl31_param(struct bl31_plat_param *param);
#endif/* __BL31_PLAT_PARAMS_H__ */
diff --git a/src/soc/cavium/cn81xx/soc.c b/src/soc/cavium/cn81xx/soc.c
index f1e11d335b..8abb328ba8 100644
--- a/src/soc/cavium/cn81xx/soc.c
+++ b/src/soc/cavium/cn81xx/soc.c
@@ -354,7 +354,7 @@ static void soc_init_atf(void)
/* Point to devicetree in secure memory */
fdt_param.fdt_ptr = (uintptr_t)_sff8104;
- register_bl31_param(&fdt_param.h);
+ cn81xx_register_bl31_param(&fdt_param.h);
static struct bl31_u64_param cbtable_param = {
.h = { .type = PARAM_COREBOOT_TABLE, },
@@ -362,7 +362,7 @@ static void soc_init_atf(void)
/* Point to coreboot tables */
cbtable_param.value = (uint64_t)cbmem_find(CBMEM_ID_CBTABLE);
if (cbtable_param.value)
- register_bl31_param(&cbtable_param.h);
+ cn81xx_register_bl31_param(&cbtable_param.h);
}
static void soc_init(struct device *dev)