summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorBin Meng <bmeng@tinylab.org>2023-04-03 06:40:26 +0300
committerSimon Glass <sjg@chromium.org>2023-04-28 20:30:17 +0300
commit327883c3c93692cca32d20a7f59b07f5c3d0c5c8 (patch)
tree10e624a7091a233b6539105a9345e2b4a696868f /boot
parent9963b1f5b80ad3923ff5100a4b91ab1906521ff2 (diff)
downloadu-boot-327883c3c93692cca32d20a7f59b07f5c3d0c5c8.tar.xz
boot: vbe_simple: Fix vbe_simple_read_bootflow() dependency
vbe_simple_read_bootflow() calls vbe_simple_read_bootflow_fw() which is only available when BOOTMETH_VBE_SIMPLE_FW is on. Signed-off-by: Bin Meng <bmeng@tinylab.org> Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'boot')
-rw-r--r--boot/vbe_simple.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c
index 59676d8613..12682abd39 100644
--- a/boot/vbe_simple.c
+++ b/boot/vbe_simple.c
@@ -148,11 +148,13 @@ static int vbe_simple_read_bootflow(struct udevice *dev, struct bootflow *bflow)
{
int ret;
- if (vbe_phase() == VBE_PHASE_FIRMWARE) {
- ret = vbe_simple_read_bootflow_fw(dev, bflow);
- if (ret)
- return log_msg_ret("fw", ret);
- return 0;
+ if (CONFIG_IS_ENABLED(BOOTMETH_VBE_SIMPLE_FW)) {
+ if (vbe_phase() == VBE_PHASE_FIRMWARE) {
+ ret = vbe_simple_read_bootflow_fw(dev, bflow);
+ if (ret)
+ return log_msg_ret("fw", ret);
+ return 0;
+ }
}
return -EINVAL;