Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 08:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

spl: don't assume NVMe partition 1 exists

Browse source 
There is no requirement that a partition 1 exists in a partition table.
We should not try to retrieve information about it.

We should not even try reading with partition number
CONFIG_SYS_NVME_BOOT_PARTITION here as this is done in the fs_set_blk_dev()
call anyway.

Fixes: 8ce6a2e175 ("spl: blk: Support loading images from fs")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Heinrich Schuchardt 2023-08-15 18:07:36 +02:00
parent 97f4bc372f
commit 4ad85a9fea
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/spl/spl_blk_fs.c
View file

@ -44,7 +44,6 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
enum uclass_id uclass_id, int devnum, int partnum) enum uclass_id uclass_id, int devnum, int partnum)
{ {
const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME; const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
struct disk_partition part_info = {};
struct legacy_img_hdr *header; struct legacy_img_hdr *header;
struct blk_desc *blk_desc; struct blk_desc *blk_desc;
loff_t actlen, filesize; loff_t actlen, filesize;
@ -59,11 +58,6 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
blk_show_device(uclass_id, devnum); blk_show_device(uclass_id, devnum);
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
ret = part_get_info(blk_desc, 1, &part_info);
if (ret) {
printf("spl: no partition table found. Err - %d\n", ret);
goto out;
}
dev.ifname = blk_get_uclass_name(uclass_id); dev.ifname = blk_get_uclass_name(uclass_id);
snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x", snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x",