Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: Rename some FSP functions to have an fsp_ prefix

Browse source 
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>
This commit is contained in:
Simon Glass 2019-09-25 08:11:25 -06:00 committed by Bin Meng
parent ff7abb85a4
commit e2adc369ec
8 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/cpu/baytrail/fsp_configs.c
View file

@ -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 * 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. * 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 fspinit_rtbuf *rt_buf)
{ {
struct upd_region *fsp_upd = &config->fsp_upd; struct upd_region *fsp_upd = &config->fsp_upd;

2
arch/x86/cpu/braswell/fsp_configs.c
View file

@ -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 * If the device tree does not specify an integer setting, use the default
* provided in Intel's Braswell release FSP/BraswellFsp.bsf file. * 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 fspinit_rtbuf *rt_buf)
{ {
struct upd_region *fsp_upd = &config->fsp_upd; struct upd_region *fsp_upd = &config->fsp_upd;

2
arch/x86/cpu/ivybridge/fsp_configs.c
View file

@ -9,7 +9,7 @@
DECLARE_GLOBAL_DATA_PTR; 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 fspinit_rtbuf *rt_buf)
{ {
struct platform_config *plat_config = &config->plat_config; struct platform_config *plat_config = &config->plat_config;

2
arch/x86/cpu/queensbay/fsp_configs.c
View file

@ -7,7 +7,7 @@
#include <common.h> #include <common.h>
#include <asm/fsp1/fsp_support.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) struct fspinit_rtbuf *rt_buf)
{ {
/* Initialize runtime buffer for fsp_init() */ /* Initialize runtime buffer for fsp_init() */

6
arch/x86/include/asm/fsp1/fsp_support.h
View file

@ -25,7 +25,7 @@
* *
* This routine jumps to the C version of FSP continuation function * This routine jumps to the C version of FSP continuation function
*/ */
void asm_continuation(void); void fsp_asm_continuation(void);
/** /**
* FSP initialization complete * 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. * @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. * FSP initialization wrapper function.
@ -172,7 +172,7 @@ void *fsp_get_graphics_info(const void *hob_list, u32 *len);
* *
* @return: None * @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); struct fspinit_rtbuf *rt_buf);
/** /**

10
arch/x86/lib/fsp1/fsp_car.S
View file

@ -20,10 +20,10 @@ car_init:
car_init_start: car_init_start:
post_code(POST_CAR_START) post_code(POST_CAR_START)
lea find_fsp_header_romstack, %esp lea fsp_find_header_romstack, %esp
jmp find_fsp_header jmp fsp_find_header
find_fsp_header_ret: fsp_find_header_ret:
/* EAX points to FSP_INFO_HEADER */ /* EAX points to FSP_INFO_HEADER */
mov %eax, %ebp mov %eax, %ebp
@ -91,8 +91,8 @@ die:
* contain the function return address as well as the parameters. * contain the function return address as well as the parameters.
*/ */
.balign 4 .balign 4
find_fsp_header_romstack: fsp_find_header_romstack:
.long find_fsp_header_ret .long fsp_find_header_ret
.balign 4 .balign 4
temp_ram_init_romstack: temp_ram_init_romstack:

14
arch/x86/lib/fsp1/fsp_support.c
View file

@ -8,7 +8,7 @@
#include <asm/fsp1/fsp_support.h> #include <asm/fsp1/fsp_support.h>
#include <asm/post.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, * 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; struct upd_region *fsp_upd;
#endif #endif
fsp_hdr = find_fsp_header(); fsp_hdr = fsp_find_header();
if (fsp_hdr == NULL) { if (fsp_hdr == NULL) {
/* No valid FSP info header was found */ /* No valid FSP info header was found */
panic("Invalid FSP header"); 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)); memset(&rt_buf, 0, sizeof(struct fspinit_rtbuf));
/* Override any configuration if required */ /* 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)); memset(&params, 0, sizeof(struct fsp_init_params));
params.nvs_buf = nvs_buf; params.nvs_buf = nvs_buf;
params.rt_buf = (struct fspinit_rtbuf *)&rt_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); init = (fsp_init_f)(fsp_hdr->img_base + fsp_hdr->fsp_init);
params_ptr = &params; params_ptr = &params;
@ -146,8 +146,8 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
asm volatile ( asm volatile (
"pushl %0;" "pushl %0;"
"call *%%eax;" "call *%%eax;"
".global asm_continuation;" ".global fsp_asm_continuation;"
"asm_continuation:;" "fsp_asm_continuation:;"
"movl 4(%%esp), %%eax;" /* status */ "movl 4(%%esp), %%eax;" /* status */
"movl 8(%%esp), %%edx;" /* hob_list */ "movl 8(%%esp), %%edx;" /* hob_list */
"jmp fsp_continue;" "jmp fsp_continue;"
@ -173,7 +173,7 @@ u32 fsp_notify(struct fsp_header *fsp_hdr, u32 phase)
u32 status; u32 status;
if (!fsp_hdr) if (!fsp_hdr)
fsp_hdr = (struct fsp_header *)find_fsp_header(); fsp_hdr = (struct fsp_header *)fsp_find_header();
if (fsp_hdr == NULL) { if (fsp_hdr == NULL) {
/* No valid FSP info header */ /* No valid FSP info header */

2
cmd/x86/fsp.c
View file

@ -11,7 +11,7 @@ DECLARE_GLOBAL_DATA_PTR;
static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) 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; u32 img_addr = hdr->img_base;
char *sign = (char *)&hdr->sign; char *sign = (char *)&hdr->sign;
int i; int i;