Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-15 17:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Stop working around skip-at-start

Browse source 
With a recent Binman change, the skip-at-start property is now honoured,
meaning that all image-pos values in the affected section start from
the skip-at-start value.

The x86 code works around the old behaviour at present, so update it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2025-02-26 09:26:18 -07:00 • committed by Tom Rini
parent 2c252d36b8
commit ebe3c3c4a8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/cpu/intel_common/intel_opregion.c
View file

@ -31,6 +31,7 @@ static int locate_vbt(char **vbtp, int *sizep)
size = vbt.size; size = vbt.size;
if (size > sizeof(vbt_data)) if (size > sizeof(vbt_data))
return log_msg_ret("vbt", -E2BIG); return log_msg_ret("vbt", -E2BIG);
vbt.image_pos += CONFIG_ROM_SIZE;
ret = spi_flash_read_dm(dev, vbt.image_pos, size, vbt_data); ret = spi_flash_read_dm(dev, vbt.image_pos, size, vbt_data);
if (ret) if (ret)
return log_msg_ret("read", ret); return log_msg_ret("read", ret);

3
arch/x86/lib/fsp2/fsp_init.c
View file

@ -107,7 +107,6 @@ int fsp_locate_fsp(enum fsp_type_t type, struct binman_entry *entry,
bool use_spi_flash, struct udevice **devp, bool use_spi_flash, struct udevice **devp,
struct fsp_header **hdrp, ulong *rom_offsetp) struct fsp_header **hdrp, ulong *rom_offsetp)
{ {
ulong mask = CONFIG_ROM_SIZE - 1;
struct udevice *dev; struct udevice *dev;
ulong rom_offset = 0; ulong rom_offset = 0;
uint map_size; uint map_size;
@ -141,7 +140,7 @@ int fsp_locate_fsp(enum fsp_type_t type, struct binman_entry *entry,
if (ret) if (ret)
return log_msg_ret("binman entry", ret); return log_msg_ret("binman entry", ret);
if (!use_spi_flash) if (!use_spi_flash)
rom_offset = (map_base & mask) - CONFIG_ROM_SIZE; rom_offset = map_base + CONFIG_ROM_SIZE;
} else { } else {
ret = -ENOENT; ret = -ENOENT;
if (false) if (false)