diff options
| author | Tom Rini <[email protected]> | 2023-04-28 19:00:01 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-04-28 19:00:01 -0400 |
| commit | 076f13308c6f06e2c4feb8b408e997bc732586e1 (patch) | |
| tree | 412d95d550e2e03214f48c89db608c57886e0995 /boot | |
| parent | c9c2c95d4cd27fe0cd41fe13a863899d268f973c (diff) | |
| parent | f43fc16812487289e98389f0f643d20c444f9c9c (diff) | |
Merge tag 'dm-pull-28apr23' of https://source.denx.de/u-boot/custodians/u-boot-dm
sandbox and fdt bug fixes / tweaks
various other minor fixes
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/vbe_simple.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/boot/vbe_simple.c b/boot/vbe_simple.c index 59676d8613f..12682abd399 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; |