diff options
| author | Tom Rini <[email protected]> | 2023-07-30 17:14:22 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-07-30 17:14:22 -0400 |
| commit | 6aab91a8daf298e22f1dcf7937bc3dd09a29bb08 (patch) | |
| tree | 772d0829c3ec68135a399efb229b29f964fc920b /disk | |
| parent | a36d59ba99a19c777d896d4c70e75975654e2831 (diff) | |
| parent | 7d4c8cfe2547596d07c51b2f38cde8d4c75f17fc (diff) | |
Merge tag 'spl-2023-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for spl-2023-10-rc2
SPL:
* use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME when booting from NVMe
* initialize PCI before booting
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/disk/part.c b/disk/part.c index 186ee965006..eec02f58988 100644 --- a/disk/part.c +++ b/disk/part.c @@ -508,9 +508,11 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, #endif /* If no dev_part_str, use bootdevice environment variable */ - if (!dev_part_str || !strlen(dev_part_str) || - !strcmp(dev_part_str, "-")) - dev_part_str = env_get("bootdevice"); + if (CONFIG_IS_ENABLED(ENV_SUPPORT)) { + if (!dev_part_str || !strlen(dev_part_str) || + !strcmp(dev_part_str, "-")) + dev_part_str = env_get("bootdevice"); + } /* If still no dev_part_str, it's an error */ if (!dev_part_str) { |