diff options
| author | Tom Rini <[email protected]> | 2023-08-09 13:17:34 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-08-09 13:17:34 -0400 |
| commit | ec58228830a1f68e8e65099387cf12c5a91c9e72 (patch) | |
| tree | 391ed6ad5f3fddcb88c976b0d413fa3912e68c40 /common | |
| parent | f26eda936bfb49c99d3c7829d416809013b95d3f (diff) | |
| parent | 9234b77b9d42ebd77585091a072b4ab958ba83ed (diff) | |
Merge tag 'x86-pull-20230809' of https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: Fixes for distro booting
- x86: Move some boards to text environment
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 3 | ||||
| -rw-r--r-- | common/usb_storage.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/common/board_f.c b/common/board_f.c index 7d2c380e91e..791c1e601c4 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -411,8 +411,7 @@ __weak int arch_reserve_mmu(void) static int reserve_video(void) { - if (IS_ENABLED(CONFIG_SPL_VIDEO) && spl_phase() > PHASE_SPL && - CONFIG_IS_ENABLED(BLOBLIST)) { + if (IS_ENABLED(CONFIG_SPL_VIDEO_HANDOFF) && spl_phase() > PHASE_SPL) { struct video_handoff *ho; ho = bloblist_find(BLOBLISTT_U_BOOT_VIDEO, sizeof(*ho)); diff --git a/common/usb_storage.c b/common/usb_storage.c index ac642757737..85774220ef2 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -246,7 +246,7 @@ static int usb_stor_probe_device(struct usb_device *udev) if (ret) return ret; - ret = bootdev_setup_sibling_blk(dev, "usb_bootdev"); + ret = bootdev_setup_for_sibling_blk(dev, "usb_bootdev"); if (ret) { int ret2; |