x86: Stop working around skip-at-start

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>

diff --git a/arch/x86/cpu/intel_common/intel_opregion.c b/arch/x86/cpu/intel_common/intel_opregion.c
index 78caff0..4a2717b 100644 (file)
--- a/arch/x86/cpu/intel_common/intel_opregion.c
+++ b/arch/x86/cpu/intel_common/intel_opregion.c
@@ -31,6 +31,7 @@ static int locate_vbt(char **vbtp, int *sizep)
        size = vbt.size;
        if (size > sizeof(vbt_data))
                return log_msg_ret("vbt", -E2BIG);
+       vbt.image_pos += CONFIG_ROM_SIZE;
        ret = spi_flash_read_dm(dev, vbt.image_pos, size, vbt_data);
        if (ret)
                return log_msg_ret("read", ret);

diff --git a/arch/x86/lib/fsp2/fsp_init.c b/arch/x86/lib/fsp2/fsp_init.c
index 1a2bf46..0be892b 100644 (file)
--- 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)