LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: fsp: Rename update_fsp_upd() and change its signature 

To support platform-specific configurations (might not always be
UPD on some platform), use a better name update_fsp_configs() and
accepct struct fsp_config_data as its parameter so that platform
codes can handle whatever configuration data for that FSP.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2015-12-10 22:03:00 -08:00
parent cb379a34c4
commit 81f84aa6c9
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/cpu/baytrail/fsp_configs.c
View File

@ -121,12 +121,13 @@ const struct pch_azalia_config azalia_config = {
}; };
/** /**
* Override the FSP's UPD. * Override the FSP's configuration data.
* 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_upd(struct upd_region *fsp_upd) void update_fsp_configs(struct fsp_config_data *config)
{ {
struct upd_region *fsp_upd = &config->fsp_upd;
struct memory_down_data *mem; struct memory_down_data *mem;
const void *blob = gd->fdt_blob; const void *blob = gd->fdt_blob;
int node; int node;

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

@ -8,7 +8,7 @@
#include <common.h> #include <common.h>
#include <asm/fsp/fsp_support.h> #include <asm/fsp/fsp_support.h>
void update_fsp_upd(struct upd_region *fsp_upd) void update_fsp_configs(struct fsp_config_data *config)
{ {
/* Override any UPD setting if required */ /* Override any UPD setting if required */

6
arch/x86/include/asm/fsp/fsp_support.h
View File

@ -192,13 +192,13 @@ void *fsp_get_nvs_data(const void *hob_list, u32 *len);
void *fsp_get_bootloader_tmp_mem(const void *hob_list, u32 *len); void *fsp_get_bootloader_tmp_mem(const void *hob_list, u32 *len);
/** /**
* This function overrides the default configurations in the UPD data region. * This function overrides the default configurations of FSP.
* *
* @fsp_upd: A pointer to the upd_region data strcture * @config: A pointer to the FSP configuration data structure
* *
* @return: None * @return: None
*/ */
void update_fsp_upd(struct upd_region *fsp_upd); void update_fsp_configs(struct fsp_config_data *config);
/** /**
* fsp_init_phase_pci() - Tell the FSP that we have completed PCI init * fsp_init_phase_pci() - Tell the FSP that we have completed PCI init

12
arch/x86/lib/fsp/fsp_support.c
View File

@ -118,6 +118,10 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
panic("Invalid FSP header"); panic("Invalid FSP header");
} }
config_data.common.fsp_hdr = fsp_hdr;
config_data.common.stack_top = stack_top;
config_data.common.boot_mode = boot_mode;
fsp_upd = &config_data.fsp_upd; fsp_upd = &config_data.fsp_upd;
memset(&rt_buf, 0, sizeof(struct fspinit_rtbuf)); memset(&rt_buf, 0, sizeof(struct fspinit_rtbuf));
@ -140,8 +144,8 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
/* Verify the UPD data region is valid */ /* Verify the UPD data region is valid */
assert(fsp_upd->terminator == UPD_TERMINATOR); assert(fsp_upd->terminator == UPD_TERMINATOR);
/* Override any UPD setting if required */ /* Override any configuration if required */
update_fsp_upd(fsp_upd); update_fsp_configs(&config_data);
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;
@ -151,10 +155,6 @@ void fsp_init(u32 stack_top, u32 boot_mode, void *nvs_buf)
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;
config_data.common.fsp_hdr = fsp_hdr;
config_data.common.stack_top = stack_top;
config_data.common.boot_mode = boot_mode;
post_code(POST_PRE_MRC); post_code(POST_PRE_MRC);
/* Load GDT for FSP */ /* Load GDT for FSP */