spl: blk: use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME

We should target to unify the code for different block devices in SPL to
reduce code size.

MMC, USB, SATA, and Semihosting use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME to
indicate the filename to load.

NVMe uses CONFIG_SPL_PAYLOAD in spl_blk_load_image().

CONFIG_SPL_PAYLOAD is meant to define which binary to integrate into
u-boot-with-spl.bin. See commit
7550dbe38b3f ("spl: Add option SPL_PAYLOAD").

Change spl_blk_load_image() to use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME.

Fixes: 8ce6a2e17577 ("spl: blk: Support loading images from fs")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Mayuresh Chitale <mchitale@ventanamicro.com>

diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c
index d97adc4..d4161fa 100644 (file)
--- 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;