diff options
author | Tom Rini <trini@konsulko.com> | 2025-03-10 18:12:27 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-03-10 20:18:51 -0600 |
commit | 1b42f57ec82ceba4d5f08cfb359717232301cfa5 (patch) | |
tree | 31d06c51e893855c3f52c0aa9bc9330b17376374 /arch/x86/lib/fsp2/fsp_init.c | |
parent | 124b75644cf4a9b381746f6deed1472e7915b9f1 (diff) | |
parent | a383b9bd4d7e430fe7c254297540bae596649dba (diff) |
Merge tag 'v2025.04-rc4' into next
This uses Heinrich's merge of lib/efi_loader/efi_net.c which results in
no changes.
Diffstat (limited to 'arch/x86/lib/fsp2/fsp_init.c')
-rw-r--r-- | arch/x86/lib/fsp2/fsp_init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c index 1a2bf46c5c5..0be892b14dc 100644 --- a/arch/x86/lib/fsp2/fsp_init.c +++ b/arch/x86/lib/fsp2/fsp_init.c @@ -107,7 +107,6 @@ int fsp_locate_fsp(enum fsp_type_t type, struct binman_entry *entry, bool use_spi_flash, struct udevice **devp, struct fsp_header **hdrp, ulong *rom_offsetp) { - ulong mask = CONFIG_ROM_SIZE - 1; struct udevice *dev; ulong rom_offset = 0; uint map_size; @@ -141,7 +140,7 @@ int fsp_locate_fsp(enum fsp_type_t type, struct binman_entry *entry, if (ret) return log_msg_ret("binman entry", ret); if (!use_spi_flash) - rom_offset = (map_base & mask) - CONFIG_ROM_SIZE; + rom_offset = map_base + CONFIG_ROM_SIZE; } else { ret = -ENOENT; if (false) |