[PATCH v3 1/3] arch: x86: apl: Only load VBT if CONFIG_HAVE_VBT is enabled

[Bin Meng]

Hi Bernhard,

On Tue, May 12, 2020 at 3:35 PM Bernhard Messerklinger
<bernhard.messerklinger at br-automation.com> wrote:
>
> Only load VBT if it's present in the u-boot.rom.
>
> Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger at br-automation.com>
> ---
>
> Changes in v3: None
> Changes in v2: None
>
>  arch/x86/cpu/apollolake/fsp_s.c | 46 ++++++++++++++++++---------------
>  1 file changed, 25 insertions(+), 21 deletions(-)
>
> diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
> index 7ef169b147..9b13b16eaf 100644
> --- a/arch/x86/cpu/apollolake/fsp_s.c
> +++ b/arch/x86/cpu/apollolake/fsp_s.c
> @@ -327,28 +327,32 @@ int fsps_update_config(struct udevice *dev, ulong rom_offset,
>  {
>         struct fsp_s_config *cfg = &upd->config;
>         struct apl_config *apl;
> -       struct binman_entry vbt;
> -       void *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)
> -               return log_msg_ret("Alloc VBT", -ENOMEM);
>
> -       /*
> -        * Load VBT before devicetree-specific config. This only supports
> -        * memory-mapped SPI at present.

nits: * is not aligned

> -        */
> -       bootstage_start(BOOTSTAGE_ID_ACCUM_MMAP_SPI, "mmap_spi");
> -       memcpy(buf, (void *)vbt.image_pos, vbt.size);
> -       bootstage_accum(BOOTSTAGE_ID_ACCUM_MMAP_SPI);
> -       if (*(u32 *)buf != VBT_SIGNATURE)
> -               return log_msg_ret("VBT signature", -EINVAL);
> -       cfg->graphics_config_ptr = (ulong)buf;
> +       if (IS_ENABLED(CONFIG_HAVE_VBT)) {
> +               struct binman_entry vbt;
> +               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;
> +               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.
> +               */
> +               bootstage_start(BOOTSTAGE_ID_ACCUM_MMAP_SPI, "mmap_spi");
> +               memcpy(vbt_buf, (void *)vbt.image_pos, vbt.size);
> +               bootstage_accum(BOOTSTAGE_ID_ACCUM_MMAP_SPI);
> +               if (*(u32 *)vbt_buf != VBT_SIGNATURE)
> +                       return log_msg_ret("VBT signature", -EINVAL);
> +
> +               cfg->graphics_config_ptr = (ulong)vbt_buf;
> +       }
>
>         apl = malloc(sizeof(*apl));
>         if (!apl)
> --

Reviewed-by: Bin Meng <bmeng.cn at gmail.com>

Regards,
Bin