Given these exported function an fsp_ prefix since they are declared in an
fsp.h header.
Signed-off-by: Simon Glass <s...@chromium.org>
---
Changes in v2: None
arch/x86/cpu/baytrail/fsp_configs.c | 2 +-
arch/x86/cpu/braswell/fsp_configs.c | 2 +-
arch/x86/cpu/ivybridge/fsp_configs.c | 2 +-
arch/x86/cpu/queensbay/fsp_configs.c | 2 +-
arch/x86/include/asm/fsp1/fsp_support.h | 6 +++---
arch/x86/lib/fsp1/fsp_car.S | 10 +++++-----
arch/x86/lib/fsp1/fsp_support.c | 14 +++++++-------
cmd/x86/fsp.c | 2 +-
8 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/x86/cpu/baytrail/fsp_configs.c
b/arch/x86/cpu/baytrail/fsp_configs.c
index 5b5d66aa5e9..1d1948c91a8 100644
--- 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 607e333f21c..60101d742d1 100644
--- 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 773c2b2a0ae..0e6453c8477 100644
--- 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 0dd1901e07b..381edd07615 100644
--- 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 d69c0a4986a..b84fbeace7e 100644
--- a/arch/x86/include/asm/fsp1/fsp_support.h
+++ b/arch/x86/include/asm/fsp1/fsp_support.h
@@ -29,7 +29,7 @@ struct fsp_config_data;
*
* This routine jumps to the C version of FSP continuation function
*/
-void asm_continuation(void);
+void fsp_asm_continuation(void);
/**
* FSP initialization complete
@@ -56,7 +56,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.
@@ -176,7 +176,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 8c54cea3db4..a64a6534357 100644
--- 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 019a42f53fe..b5b7d664a1e 100644
--- 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(¶ms, 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 = ¶ms;
@@ -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 fb27624422c..b3b663021bc 100644
--- 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;
--
2.23.0.444.g18eeb5a265-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
