From 60705883d245c135f20660ebc7e2ed20c294387a Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 18 Oct 2021 14:02:15 +0200 Subject: [PATCH] xilinx: zynqmp: Use CONFIG_SPL_FS_LOAD_PAYLOAD_NAME There is no need to use u-boot.itb as name when this is already recorded in CONFIG_SPL_FS_LOAD_PAYLOAD_NAME macro. Signed-off-by: Michal Simek Reviewed-by: Oleksandr Suvorov Link: https://lore.kernel.org/r/38a236ed317510c26b37525da0e7bc26b411222c.1634558534.git.michal.simek@xilinx.com --- board/xilinx/zynqmp/zynqmp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e8ae549698..6335184467 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -875,20 +875,23 @@ void set_dfu_alt_info(char *interface, char *devstr) if (!multiboot) snprintf(buf, DFU_ALT_BUF_LEN, "mmc %d:1=boot.bin fat %d 1;" - "u-boot.itb fat %d 1", - bootseq, bootseq, bootseq); + "%s fat %d 1", + bootseq, bootseq, + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, bootseq); else snprintf(buf, DFU_ALT_BUF_LEN, "mmc %d:1=boot%04d.bin fat %d 1;" - "u-boot.itb fat %d 1", - bootseq, multiboot, bootseq, bootseq); + "%s fat %d 1", + bootseq, multiboot, bootseq, + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, bootseq); break; case QSPI_MODE_24BIT: case QSPI_MODE_32BIT: snprintf(buf, DFU_ALT_BUF_LEN, "sf 0:0=boot.bin raw %x 0x1500000;" - "u-boot.itb raw 0x%x 0x500000", - multiboot * SZ_32K, CONFIG_SYS_SPI_U_BOOT_OFFS); + "%s raw 0x%x 0x500000", + multiboot * SZ_32K, CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, + CONFIG_SYS_SPI_U_BOOT_OFFS); break; default: return; -- 2.39.5