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>

diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index 3e303f8f32806a456da318bd37b8f424b7167151..53ed5041c3b59083e42e7344bf1ae46e473facfc 100644 (file)
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -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;
-       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.
-        */
-       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)