refactor(qemu-sbsa): rename function sip_svc_init() to something more meaningful
There is no relation between the name of function sip_svc_init() and
what it does. As such rename it to something more appropriate and move
it to a header that make sense.
No change in functionality.
Change-Id: I7bd78b1fe70e2930c395ef0a097bfad3b1e55d3a
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
diff --git a/plat/qemu/common/qemu_bl31_setup.c b/plat/qemu/common/qemu_bl31_setup.c
index 33354dc..c047640 100644
--- a/plat/qemu/common/qemu_bl31_setup.c
+++ b/plat/qemu/common/qemu_bl31_setup.c
@@ -14,6 +14,9 @@
#if ENABLE_RME
#include <qemu_pas_def.h>
#endif
+#ifdef PLAT_qemu_sbsa
+#include <sbsa_platform.h>
+#endif
#include "qemu_private.h"
@@ -66,7 +69,7 @@
/* Platform names have to be lowercase. */
#ifdef PLAT_qemu_sbsa
- sip_svc_init();
+ sbsa_platform_init();
#endif
/*
diff --git a/plat/qemu/common/qemu_private.h b/plat/qemu/common/qemu_private.h
index 25b14e2..25e472d 100644
--- a/plat/qemu/common/qemu_private.h
+++ b/plat/qemu/common/qemu_private.h
@@ -18,9 +18,6 @@
const mmap_region_t *plat_qemu_get_mmap(void);
void qemu_console_init(void);
-#ifdef PLAT_qemu_sbsa
-void sip_svc_init(void);
-#endif
void plat_qemu_gic_init(void);
void qemu_pwr_gic_on_finish(void);
diff --git a/plat/qemu/qemu_sbsa/include/sbsa_platform.h b/plat/qemu/qemu_sbsa/include/sbsa_platform.h
index 78f1031..e297f6a 100644
--- a/plat/qemu/qemu_sbsa/include/sbsa_platform.h
+++ b/plat/qemu/qemu_sbsa/include/sbsa_platform.h
@@ -43,4 +43,6 @@
struct platform_memory_data memory[PLAT_MAX_MEM_NODES];
};
+void sbsa_platform_init(void);
+
#endif /* SBSA_PLATFORM_H */
diff --git a/plat/qemu/qemu_sbsa/sbsa_sip_svc.c b/plat/qemu/qemu_sbsa/sbsa_sip_svc.c
index afe908e..31d9b24 100644
--- a/plat/qemu/qemu_sbsa/sbsa_sip_svc.c
+++ b/plat/qemu/qemu_sbsa/sbsa_sip_svc.c
@@ -297,7 +297,7 @@
}
}
-void sip_svc_init(void)
+void sbsa_platform_init(void)
{
/* Read DeviceTree data before MMU is enabled */