amlogic: Fix prefixes in the private header file

The header file is shared between all the SoCs. Better avoiding
hardcoding the SoC name in the function names.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: I9074871bd1ed8a702c1a656e0f50f2d3c6cb0425

diff --git a/plat/amlogic/common/include/aml_private.h b/plat/amlogic/common/include/aml_private.h
index 952b5c43c57180b286ce13e5f2eb06f332f3eae8..3d7e6ebdab47ae6d0bbee4ec51e45755b39530e2 100644 (file)
--- a/plat/amlogic/common/include/aml_private.h
+++ b/plat/amlogic/common/include/aml_private.h
@@ -12,8 +12,8 @@
 
 /* Utility functions */
 unsigned int plat_calc_core_pos(u_register_t mpidr);
-void gxbb_console_init(void);
-void gxbb_setup_page_tables(void);
+void aml_console_init(void);
+void aml_setup_page_tables(void);
 
 /* MHU functions */
 void mhu_secure_message_start(void);

diff --git a/plat/amlogic/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c
index e5402c3395b8f2cfd8b00cf14c473b0dab12f872..c474d6967c4d29d39e350028b3f4593860a43b5d 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_bl31_setup.c
+++ b/plat/amlogic/gxbb/gxbb_bl31_setup.c
@@ -67,7 +67,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
        struct gxbb_bl31_param *from_bl2;
 
        /* Initialize the console to provide early debug support */
-       gxbb_console_init();
+       aml_console_init();
 
        /*
         * In debug builds, we pass a special value in 'arg1' to verify platform
@@ -97,7 +97,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
 
 void bl31_plat_arch_setup(void)
 {
-       gxbb_setup_page_tables();
+       aml_setup_page_tables();
 
        enable_mmu_el3(0);
 }

diff --git a/plat/amlogic/gxbb/gxbb_common.c b/plat/amlogic/gxbb/gxbb_common.c
index 06ff0082aeca674dc2ba347da8a2cbd23b363e87..7560932568343d8f774cfc425b6b11a2061257d5 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_common.c
+++ b/plat/amlogic/gxbb/gxbb_common.c
@@ -81,7 +81,7 @@ static const mmap_region_t gxbb_mmap[] = {
 /*******************************************************************************
  * Function that sets up the translation tables.
  ******************************************************************************/
-void gxbb_setup_page_tables(void)
+void aml_setup_page_tables(void)
 {
 #if IMAGE_BL31
        const mmap_region_t gxbb_bl_mmap[] = {
@@ -107,7 +107,7 @@ void gxbb_setup_page_tables(void)
  ******************************************************************************/
 static console_meson_t gxbb_console;
 
-void gxbb_console_init(void)
+void aml_console_init(void)
 {
        int rc = console_meson_register(AML_UART0_AO_BASE,
                                        AML_UART0_AO_CLK_IN_HZ,

diff --git a/plat/amlogic/gxl/gxl_bl31_setup.c b/plat/amlogic/gxl/gxl_bl31_setup.c
index 796f1a0a80cd0258f0149f52deb649715b9ef81c..d44b9aaa36671dff7ce2c9da4cca3dfb5216b136 100644 (file)
--- a/plat/amlogic/gxl/gxl_bl31_setup.c
+++ b/plat/amlogic/gxl/gxl_bl31_setup.c
@@ -69,7 +69,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
        struct gxl_bl31_param *from_bl2;
 
        /* Initialize the console to provide early debug support */
-       gxbb_console_init();
+       aml_console_init();
 
        /* Check that params passed from BL2 are not NULL. */
        from_bl2 = (struct gxl_bl31_param *) arg0;
@@ -96,7 +96,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
 
 void bl31_plat_arch_setup(void)
 {
-       gxbb_setup_page_tables();
+       aml_setup_page_tables();
 
        enable_mmu_el3(0);
 }

diff --git a/plat/amlogic/gxl/gxl_common.c b/plat/amlogic/gxl/gxl_common.c
index cede8d8c8e91c8dc19b713a65710df6dd0cc95b0..f975cadda2942b447446eae264e0d4bb628e0f4f 100644 (file)
--- a/plat/amlogic/gxl/gxl_common.c
+++ b/plat/amlogic/gxl/gxl_common.c
@@ -79,7 +79,7 @@ static const mmap_region_t gxbb_mmap[] = {
 /*******************************************************************************
  * Function that sets up the translation tables.
  ******************************************************************************/
-void gxbb_setup_page_tables(void)
+void aml_setup_page_tables(void)
 {
 #if IMAGE_BL31
        const mmap_region_t gxbb_bl_mmap[] = {
@@ -105,7 +105,7 @@ void gxbb_setup_page_tables(void)
  ******************************************************************************/
 static console_meson_t gxbb_console;
 
-void gxbb_console_init(void)
+void aml_console_init(void)
 {
        int rc = console_meson_register(AML_UART0_AO_BASE,
                                        AML_UART0_AO_CLK_IN_HZ,