mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
x86: apl: Only load VBT if CONFIG_HAVE_VBT is enabled
Only load VBT if it's present in the u-boot.rom. Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> (Tested on coral) Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
parent
b032db2725
commit
832fee864c
|
@ -331,28 +331,32 @@ int fsps_update_config(struct udevice *dev, ulong rom_offset,
|
|||
{
|
||||
struct fsp_s_config *cfg = &upd->config;
|
||||
struct apl_config *apl;
|
||||
|
||||
if (IS_ENABLED(CONFIG_HAVE_VBT)) {
|
||||
struct binman_entry vbt;
|
||||
void *buf;
|
||||
void *vbt_buf;
|
||||
int ret;
|
||||
|
||||
ret = binman_entry_find("intel-vbt", &vbt);
|
||||
if (ret)
|
||||
return log_msg_ret("Cannot find VBT", ret);
|
||||
vbt.image_pos += rom_offset;
|
||||
buf = malloc(vbt.size);
|
||||
if (!buf)
|
||||
vbt_buf = malloc(vbt.size);
|
||||
if (!vbt_buf)
|
||||
return log_msg_ret("Alloc VBT", -ENOMEM);
|
||||
|
||||
/*
|
||||
* Load VBT before devicetree-specific config. This only supports
|
||||
* memory-mapped SPI at present.
|
||||
* Load VBT before devicetree-specific config. This only
|
||||
* supports memory-mapped SPI at present.
|
||||
*/
|
||||
bootstage_start(BOOTSTAGE_ID_ACCUM_MMAP_SPI, "mmap_spi");
|
||||
memcpy(buf, (void *)vbt.image_pos, vbt.size);
|
||||
memcpy(vbt_buf, (void *)vbt.image_pos, vbt.size);
|
||||
bootstage_accum(BOOTSTAGE_ID_ACCUM_MMAP_SPI);
|
||||
if (*(u32 *)buf != VBT_SIGNATURE)
|
||||
if (*(u32 *)vbt_buf != VBT_SIGNATURE)
|
||||
return log_msg_ret("VBT signature", -EINVAL);
|
||||
cfg->graphics_config_ptr = (ulong)buf;
|
||||
|
||||
cfg->graphics_config_ptr = (ulong)vbt_buf;
|
||||
}
|
||||
|
||||
apl = malloc(sizeof(*apl));
|
||||
if (!apl)
|
||||
|
|
Loading…
Reference in New Issue
Block a user