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 /common | |
| 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 'common')
| -rw-r--r-- | common/spl/spl.c | 7 | ||||
| -rw-r--r-- | common/spl/spl_blk_fs.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_nvme.c | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index f09bb977814..0062f3f45d9 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -800,6 +800,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2) IS_ENABLED(CONFIG_SPL_ATF)) dram_init_banksize(); + if (CONFIG_IS_ENABLED(PCI)) { + ret = pci_init(); + if (ret) + puts(SPL_TPL_PROMPT "Cannot initialize PCI\n"); + /* Don't fail. We still can try other boot methods. */ + } + bootcount_inc(); /* Dump driver model states to aid analysis */ diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index d97adc4d39a..16ecece7023 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -43,7 +43,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, enum uclass_id uclass_id, int devnum, int partnum) { - const char *filename = CONFIG_SPL_PAYLOAD; + const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME; struct disk_partition part_info = {}; struct legacy_img_hdr *header; struct blk_desc *blk_desc; @@ -66,7 +66,7 @@ int spl_blk_load_image(struct spl_image_info *spl_image, } dev.ifname = blk_get_uclass_name(uclass_id); - snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%d:%d", + snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x", devnum, partnum); ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); if (ret) { diff --git a/common/spl/spl_nvme.c b/common/spl/spl_nvme.c index 2af63f1dc8c..c8774d67ecf 100644 --- a/common/spl/spl_nvme.c +++ b/common/spl/spl_nvme.c @@ -7,7 +7,6 @@ #include <common.h> #include <spl.h> -#include <init.h> #include <nvme.h> static int spl_nvme_load_image(struct spl_image_info *spl_image, @@ -15,10 +14,6 @@ static int spl_nvme_load_image(struct spl_image_info *spl_image, { int ret; - ret = pci_init(); - if (ret < 0) - return ret; - ret = nvme_scan_namespace(); if (ret < 0) return ret; |