x86: Rename some FSP functions to have an fsp_ prefix

Given these exported function an fsp_ prefix since they are declared in an
fsp.h header.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/baytrail/fsp_configs.c b/arch/x86/cpu/baytrail/fsp_configs.c
index 5b5d66aa5e913fc527f653b5c13df4135b1e009e..1d1948c91a8d1808b9e1d9cfabbdcd5e3face682 100644 (file)
--- a/arch/x86/cpu/baytrail/fsp_configs.c
+++ b/arch/x86/cpu/baytrail/fsp_configs.c
@@ -27,7 +27,7 @@ __weak void update_fsp_azalia_configs(struct azalia_config **azalia)
  * If the device tree does not specify an integer setting, use the default
  * provided in Intel's Baytrail_FSP_Gold4.tgz release FSP/BayleyBayFsp.bsf file.
  */
-void update_fsp_configs(struct fsp_config_data *config,
+void fsp_update_configs(struct fsp_config_data *config,
                        struct fspinit_rtbuf *rt_buf)
 {
        struct upd_region *fsp_upd = &config->fsp_upd;

diff --git a/arch/x86/cpu/braswell/fsp_configs.c b/arch/x86/cpu/braswell/fsp_configs.c
index 607e333f21c6ec2dc7149d5792358c1bbe16ce6b..60101d742d15e34a29d02a76d9a9b1af6360b63d 100644 (file)
--- a/arch/x86/cpu/braswell/fsp_configs.c
+++ b/arch/x86/cpu/braswell/fsp_configs.c
@@ -40,7 +40,7 @@ __weak void update_fsp_gpio_configs(struct gpio_family **family,
  * If the device tree does not specify an integer setting, use the default
  * provided in Intel's Braswell release FSP/BraswellFsp.bsf file.
  */
-void update_fsp_configs(struct fsp_config_data *config,
+void fsp_update_configs(struct fsp_config_data *config,
                        struct fspinit_rtbuf *rt_buf)
 {
        struct upd_region *fsp_upd = &config->fsp_upd;

diff --git a/arch/x86/cpu/ivybridge/fsp_configs.c b/arch/x86/cpu/ivybridge/fsp_configs.c
index 773c2b2a0ae7c0830f75ec1322ed037939943266..0e6453c84778f9227219d6bfda62dc4f36d56f1b 100644 (file)
--- a/arch/x86/cpu/ivybridge/fsp_configs.c
+++ b/arch/x86/cpu/ivybridge/fsp_configs.c
@@ -9,7 +9,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void update_fsp_configs(struct fsp_config_data *config,
+void fsp_update_configs(struct fsp_config_data *config,
                        struct fspinit_rtbuf *rt_buf)
 {
        struct platform_config *plat_config = &config->plat_config;

diff --git a/arch/x86/cpu/queensbay/fsp_configs.c b/arch/x86/cpu/queensbay/fsp_configs.c
index 0dd1901e07b5cc2bfc5b9c08f357eb4ff314e71e..381edd0761587b21747b33ee874f92c0f9f02f88 100644 (file)
--- a/arch/x86/cpu/queensbay/fsp_configs.c
+++ b/arch/x86/cpu/queensbay/fsp_configs.c
@@ -7,7 +7,7 @@
 #include <common.h>
 #include <asm/fsp1/fsp_support.h>
 
-void update_fsp_configs(struct fsp_config_data *config,
+void fsp_update_configs(struct fsp_config_data *config,
                        struct fspinit_rtbuf *rt_buf)
 {
        /* Initialize runtime buffer for fsp_init() */

diff --git a/arch/x86/include/asm/fsp1/fsp_support.h b/arch/x86/include/asm/fsp1/fsp_support.h
index c2c5288ebd1e522235495aac1eba8ed8deeea913..a0095d0de4bddce683d49cb299b710b863051e05 100644 (file)
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -25,7 +25,7 @@
  *
  * This routine jumps to the C version of FSP continuation function
  */
-void asm_continuation(void);
+void fsp_asm_continuation(void);
 
 /**
  * FSP initialization complete
@@ -52,7 +52,7 @@ void fsp_continue(u32 status, void *hob_list);
  *
  * @retval: the offset of FSP header. If signature is invalid, returns 0.
  */
-struct fsp_header *find_fsp_header(void);
+struct fsp_header *fsp_find_header(void);
 
 /**
  * FSP initialization wrapper function.
@@ -172,7 +172,7 @@ void *fsp_get_graphics_info(const void *hob_list, u32 *len);
  *
  * @return:  None
  */
-void update_fsp_configs(struct fsp_config_data *config,
+void fsp_update_configs(struct fsp_config_data *config,
                        struct fspinit_rtbuf *rt_buf);
 
 /**

diff --git a/arch/x86/lib/fsp1/fsp_car.S b/arch/x86/lib/fsp1/fsp_car.S
index 8c54cea3db44fd052ffc7337c489815b2aca4bfb..a64a6534357e44e21f6f3dc6fb2ec7ca16d0a689 100644 (file)
--- a/arch/x86/lib/fsp1/fsp_car.S
+++ b/arch/x86/lib/fsp1/fsp_car.S
@@ -20,10 +20,10 @@ car_init:
 
 car_init_start:
        post_code(POST_CAR_START)
-       lea     find_fsp_header_romstack, %esp
-       jmp     find_fsp_header
+       lea     fsp_find_header_romstack, %esp
+       jmp     fsp_find_header
 
-find_fsp_header_ret:
+fsp_find_header_ret:
        /* EAX points to FSP_INFO_HEADER */
        mov     %eax, %ebp
 
@@ -91,8 +91,8 @@ die:
         * contain the function return address as well as the parameters.
         */
        .balign 4
-find_fsp_header_romstack:
-       .long   find_fsp_header_ret
+fsp_find_header_romstack:
+       .long   fsp_find_header_ret
 
        .balign 4
 temp_ram_init_romstack:

diff --git a/arch/x86/lib/fsp1/fsp_support.c b/arch/x86/lib/fsp1/fsp_support.c
index 019a42f53fe42f5784e6023dcf8ce6b45e80f7f2..b5b7d664a1eb19f75a8f236c6124cca5525acfb8 100644 (file)
--- a/arch/x86/lib/fsp1/fsp_support.c
+++ b/arch/x86/lib/fsp1/fsp_support.c
@@ -8,7 +8,7 @@
 #include <asm/fsp1/fsp_support.h>
 #include <asm/post.h>
 
-struct fsp_header *__attribute__((optimize("O0"))) find_fsp_header(void)
+struct fsp_header *__attribute__((optimize("O0"))) fsp_find_header(void)
 {
        /*
         * This function may be called before the a stack is established,
@@ -93,7 +93,7 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
        struct upd_region *fsp_upd;
 #endif
 
-       fsp_hdr = find_fsp_header();
+       fsp_hdr = fsp_find_header();
        if (fsp_hdr == NULL) {
                /* No valid FSP info header was found */
                panic("Invalid FSP header");
@@ -124,12 +124,12 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
        memset(&rt_buf, 0, sizeof(struct fspinit_rtbuf));
 
        /* Override any configuration if required */
-       update_fsp_configs(&config_data, &rt_buf);
+       fsp_update_configs(&config_data, &rt_buf);
 
        memset(&params, 0, sizeof(struct fsp_init_params));
        params.nvs_buf = nvs_buf;
        params.rt_buf = (struct fspinit_rtbuf *)&rt_buf;
-       params.continuation = (fsp_continuation_f)asm_continuation;
+       params.continuation = (fsp_continuation_f)fsp_asm_continuation;
 
        init = (fsp_init_f)(fsp_hdr->img_base + fsp_hdr->fsp_init);
        params_ptr = &params;
@@ -146,8 +146,8 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
        asm volatile (
                "pushl  %0;"
                "call   *%%eax;"
-               ".global asm_continuation;"
-               "asm_continuation:;"
+               ".global fsp_asm_continuation;"
+               "fsp_asm_continuation:;"
                "movl   4(%%esp), %%eax;"       /* status */
                "movl   8(%%esp), %%edx;"       /* hob_list */
                "jmp    fsp_continue;"
@@ -173,7 +173,7 @@ u32 fsp_notify(struct fsp_header *fsp_hdr, u32 phase)
        u32 status;
 
        if (!fsp_hdr)
-               fsp_hdr = (struct fsp_header *)find_fsp_header();
+               fsp_hdr = (struct fsp_header *)fsp_find_header();
 
        if (fsp_hdr == NULL) {
                /* No valid FSP info header */

diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
index fb27624422c14b29847f96a2c56659359dcc854c..b3b663021bc1e2b984c9ffda919a0ecf0670427a 100644 (file)
--- a/cmd/x86/fsp.c
+++ b/cmd/x86/fsp.c
@@ -11,7 +11,7 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       struct fsp_header *hdr = find_fsp_header();
+       struct fsp_header *hdr = fsp_find_header();
        u32 img_addr = hdr->img_base;
        char *sign = (char *)&hdr->sign;
        int i;