April 2024 - U-Boot

[PATCH v2] mmc: Add SPL_MMC_PWRSEQ to fix link issue when building SPL
by Jonas Karlman 03 Apr '24

03 Apr '24

With MMC_PWRSEQ enabled the following link issue may happen when building SPL and SPL_PWRSEQ is not enabled. aarch64-linux-gnu-ld.bfd: drivers/mmc/meson_gx_mmc.o: in function `meson_mmc_probe': drivers/mmc/meson_gx_mmc.c:295: undefined reference to `pwrseq_set_power' Fix this by adding a SPL_MMC_PWRSEQ Kconfig option used to enable mmc pwrseq support in SPL. Also add depends on DM_GPIO to fix following link issue: aarch64-linux-gnu-ld.bfd: drivers/mmc/mmc-pwrseq.o: in function `mmc_pwrseq_set_power': drivers/mmc/mmc-pwrseq.c:26: undefined reference to `gpio_request_by_name' aarch64-linux-gnu-ld.bfd: drivers/mmc/mmc-pwrseq.c:29: undefined reference to `dm_gpio_set_value' aarch64-linux-gnu-ld.bfd: drivers/mmc/mmc-pwrseq.c:31: undefined reference to `dm_gpio_set_value' Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> Reviewed-by: Kever Yang <kever.yang(a)rock-chips.com> Reviewed-by: Neil Armstrong <neil.armstrong(a)linaro.org> Acked-by: Ferass El Hafidi <vitali64pmemail(a)protonmail.com> --- Changes in v2: - Fix Ths typo - Collect r-b and a-b tags Link to v1: https://patchwork.ozlabs.org/patch/1839392/ --- drivers/mmc/Kconfig | 12 ++++++++++-- drivers/mmc/Makefile | 2 +- drivers/mmc/meson_gx_mmc.c | 2 +- drivers/mmc/rockchip_dw_mmc.c | 2 +- include/mmc.h | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 17618c3bdcc1..a141007a576f 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -20,11 +20,19 @@ config MMC_WRITE config MMC_PWRSEQ bool "HW reset support for eMMC" - depends on PWRSEQ + depends on PWRSEQ && DM_GPIO help - Ths select Hardware reset support aka pwrseq-emmc for eMMC + This select Hardware reset support aka pwrseq-emmc for eMMC devices. +config SPL_MMC_PWRSEQ + bool "HW reset support for eMMC in SPL" + depends on SPL_PWRSEQ && SPL_DM_GPIO + default y if MMC_PWRSEQ + help + This select Hardware reset support aka pwrseq-emmc for eMMC + devices in SPL. + config MMC_BROKEN_CD bool "Poll for broken card detection case" help diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index e9cf1fcc6400..2b94cc2f1c34 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -11,7 +11,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += mmc_bootdev.o endif obj-$(CONFIG_$(SPL_TPL_)MMC_WRITE) += mmc_write.o -obj-$(CONFIG_MMC_PWRSEQ) += mmc-pwrseq.o +obj-$(CONFIG_$(SPL_)MMC_PWRSEQ) += mmc-pwrseq.o obj-$(CONFIG_MMC_SDHCI_ADMA_HELPERS) += sdhci-adma.o ifndef CONFIG_$(SPL_)BLK diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c index fcf4f03d1e24..0825c0a2a838 100644 --- a/drivers/mmc/meson_gx_mmc.c +++ b/drivers/mmc/meson_gx_mmc.c @@ -288,7 +288,7 @@ static int meson_mmc_probe(struct udevice *dev) mmc_set_clock(mmc, cfg->f_min, MMC_CLK_ENABLE); -#ifdef CONFIG_MMC_PWRSEQ +#if CONFIG_IS_ENABLED(MMC_PWRSEQ) /* Enable power if needed */ ret = mmc_pwrseq_get_power(dev, cfg); if (!ret) { diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 72c820ee6330..ad4529d6afa8 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -145,7 +145,7 @@ static int rockchip_dwmmc_probe(struct udevice *dev) host->fifo_mode = priv->fifo_mode; -#ifdef CONFIG_MMC_PWRSEQ +#if CONFIG_IS_ENABLED(MMC_PWRSEQ) /* Enable power if needed */ ret = mmc_pwrseq_get_power(dev, &plat->cfg); if (!ret) { diff --git a/include/mmc.h b/include/mmc.h index 1022db3ffa7c..9aef31ea5deb 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -590,7 +590,7 @@ struct mmc_config { uint f_max; uint b_max; unsigned char part_type; -#ifdef CONFIG_MMC_PWRSEQ +#if CONFIG_IS_ENABLED(MMC_PWRSEQ) struct udevice *pwr_dev; #endif }; @@ -808,7 +808,7 @@ int mmc_deinit(struct mmc *mmc); */ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg); -#ifdef CONFIG_MMC_PWRSEQ +#if CONFIG_IS_ENABLED(MMC_PWRSEQ) /** * mmc_pwrseq_get_power() - get a power device from device tree * -- 2.43.0

2 1

[PATCH] mmc: dw_mmc: Don't return error if data busy timeout
by Yang Xiwen 03 Apr '24

03 Apr '24

As described in [1], some poor hardware or cards would fail to release the bus and keep driving data lines low. Ignore it and send the next cmd directly seems okay for most cases. [1]: https://patchwork.kernel.org/project/linux-mmc/patch/1424458179-5456-1-git-… Signed-off-by: Yang Xiwen <forbidden405(a)outlook.com> --- drivers/mmc/dw_mmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 400066fa99..e103664145 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -262,8 +262,8 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, while (dwmci_readl(host, DWMCI_STATUS) & DWMCI_BUSY) { if (get_timer(start) > timeout) { - debug("%s: Timeout on data busy\n", __func__); - return -ETIMEDOUT; + debug("%s: Timeout on data busy, continue anyway\n", __func__); + break; } } -- 2.43.0

2 1

[PATCH 1/1] mmc: Don't suggest to build modules in Kconfig.
by Heinrich Schuchardt 03 Apr '24

03 Apr '24

U-Boot does not support building kernel modules. Fixes: 3c0dbed232bd ("mmc: arm_pl180_mmci: adapt driver to DM usage") Fixes: 36645f45a048 ("drivers: mmc: Add sdhci driver for Broadcom iProc platform") Fixes: dadd43c14368 ("mmc: synquacer: Add SynQuacer F_SDH30 SDHCI driver") Fixes: b312c590bcd8 ("mmc: Add MMC support for stm32h7 Socs") Fixes: d24b69395949 ("mmc: mtk-sd: add SD/MMC host controller driver for MT7623 SoC") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/mmc/Kconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index ffde442cb29..9ce331677b8 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -83,7 +83,7 @@ config ARM_PL180_MMCI This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card Interface (PL180, PL181 and compatible) support. If you have an ARM(R) platform with a Multimedia Card slot, - say Y or M here. + say Y here. config MMC_QUIRKS bool "Enable quirks" @@ -592,7 +592,7 @@ config MMC_SDHCI_IPROC This selects the iProc SD/MMC controller. If you have a Broadcom IPROC platform with SD or MMC devices, - say Y or M here. + say Y here. If unsure, say N. @@ -603,7 +603,7 @@ config MMC_SDHCI_F_SDH30 help This selects the Secure Digital Host Controller Interface (SDHCI) Needed by some Fujitsu/Socionext SoC for MMC / SD / SDIO support. - If you have a controller with this interface, say Y or M here. + If you have a controller with this interface, say Y here. If unsure, say N. config MMC_SDHCI_KONA @@ -797,7 +797,7 @@ config STM32_SDMMC2 help This selects support for the SD/MMC controller on STM32H7 SoCs. If you have a board based on such a SoC and with a SD/MMC slot, - say Y or M here. + say Y here. config FTSDC010 bool "Ftsdc010 SD/MMC controller Support" @@ -817,7 +817,7 @@ config MMC_MTK depends on OF_CONTROL help This selects the MediaTek(R) Secure digital and Multimedia card Interface. - If you have a machine with a integrated SD/MMC card reader, say Y or M here. + If you have a machine with a integrated SD/MMC card reader, say Y here. This is needed if support for any SD/SDIO/MMC devices is required. If unsure, say N. -- 2.43.0

3 2

[PATCH 1/1] mmc: Avoid buffer overrun in mmc_startup()
by Heinrich Schuchardt 03 Apr '24

03 Apr '24

If the CSD register contains a reserved value (4 - 7) in bits 0:2 of the TRAN_SPEED field, a buffer overrun occurs. Resize the mapping table. According to the original report https://lore.kernel.org/u-boot/20180826231332.2491-11-erosca@de.adit-jv.com/ reserved values have been observed resulting in a buffer overrun. Reported-by: Eugeniu Rosca <erosca(a)de.adit-jv.com> Fixes: 272cc70b211e ("Add MMC Framework") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/mmc/mmc.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d96db7a0f8..00f4964aae 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1570,13 +1570,20 @@ static int sd_read_ssr(struct mmc *mmc) return 0; } #endif -/* frequency bases */ -/* divided by 10 to be nice to platforms without floating point */ +/* + * TRAN_SPEED bits 0:2 encode the frequency unit: + * 0 = 100KHz, 1 = 1MHz, 2 = 10MHz, 3 = 100MHz, values 4 - 7 are reserved. + * The values in fbase[] are divided by 10 to avoid floats in multiplier[]. + */ static const int fbase[] = { 10000, 100000, 1000000, 10000000, + 0, /* reserved */ + 0, /* reserved */ + 0, /* reserved */ + 0, /* reserved */ }; /* Multiplier values for TRAN_SPEED. Multiplied by 10 to be nice @@ -2560,6 +2567,8 @@ static int mmc_startup(struct mmc *mmc) mult = multipliers[((cmd.response[0] >> 3) & 0xf)]; mmc->legacy_speed = freq * mult; + if (!mmc->legacy_speed) + log_debug("TRAN_SPEED: reserved value"); mmc_select_mode(mmc, MMC_LEGACY); mmc->dsr_imp = ((cmd.response[1] >> 12) & 0x1); -- 2.43.0

3 3

Re: [PATCH v2 0/3] dt-bindings: arm: bcm: raspberrypi,bcm2835-firmware: Drive-by fixes
by Stefan Wahren 02 Apr '24

02 Apr '24

Hi, [add Peter and Ivan] Am 26.03.24 um 20:58 schrieb Laurent Pinchart: > Hello, > > This small series includes a few drive-by fixes for DT validation > errors. > > The first patch has been posted previously in v1 ([1], and now addresses > a small review comment. I think it's good to go. > > The next two patches address the same issue as "[PATCH 1/2] dt-bindings: > arm: bcm: raspberrypi,bcm2835-firmware: Add missing properties" ([2]), > but this time with a (hopefully) correct approach. Patch 2/3 starts by > fixing the raspberrypi-bcm2835-firmware driver, removing the need for DT > properties that are specified in bcm2835-rpi.dtsi but not documented in > the corresponding bindings. Patch 3/3 can then drop those properties, > getting rid of the warnings. since this series drops properties from the device tree, does anyone have the chance to test it with a recent U-Boot? > > [1] https://lore.kernel.org/linux-arm-kernel/20240326004902.17054-3-laurent.pin… > [2] https://lore.kernel.org/linux-arm-kernel/20240326004902.17054-2-laurent.pin… > > Laurent Pinchart (3): > dt-bindings: arm: bcm: raspberrypi,bcm2835-firmware: Add gpio child > node > firmware: raspberrypi: Use correct device for DMA mappings > ARM: dts: bcm283x: Drop unneeded properties in the bcm2835-firmware > node > > .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 30 +++++++++++++++++++ > .../gpio/raspberrypi,firmware-gpio.txt | 30 ------------------- > arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 4 --- > drivers/firmware/raspberrypi.c | 7 +++-- > 4 files changed, 34 insertions(+), 37 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt >

5 10

[PATCH 0/3] net: Add a CONFIG_NET_BOARD_ETHADDR
by Detlev Casanova 02 Apr '24

02 Apr '24

Basically, the MAC address generation needs to use a board function in its decision algorithm so that there is no MAC mismatch between ROM and environment depending on the order of function calling. See the first commit message for details. Detlev Casanova (3): net: Add a CONFIG_NET_BOARD_ETHADDR rockchip: Add a board_gen_ethaddr() function net: eth-uclass: Add driver source possibility arch/arm/Kconfig | 1 + arch/arm/include/asm/arch-rockchip/misc.h | 1 + arch/arm/mach-rockchip/board.c | 30 ++++++++++++++++++----- arch/arm/mach-rockchip/misc.c | 22 ++++++++++++----- net/Kconfig | 7 ++++++ net/eth-uclass.c | 25 ++++++++++++++++--- 6 files changed, 70 insertions(+), 16 deletions(-) -- 2.43.2

3 7

[PATCH 00/19] rockchip: rk35xx: Miscellaneous fixes and updates
by Jonas Karlman 02 Apr '24

02 Apr '24

This series include miscellaneous fixes and updates for RK356x and RK3588 boards. Patch 1-2 adds support for reference clocks used by USB driver. Patch 3-5 drops unnecessary Kconfig options. Patch 6-9 sort and imply RNG, PHY_GIGE and BOOTSTD_FULL Kconfig options. Patch 10-12 sort and update use of bootph properties. Patch 13-16 fixes minor issues observed with newly added boards. Patch 17 enables options on rk3588-edgeble-neu6 boards to closer match other RK35xx boards. Patch 18-19 adds SPI flash and USB OTG support to the rk35xx-generic boards. Jonas Karlman (19): clk: rockchip: rk356x: Add CLK_USB3OTGx_REF support clk: rockchip: rk3588: Add REF_CLK_USB3OTGx support rockchip: rk35xx: Drop USB_GADGET_PRODUCT_NUM Kconfig option rockchip: rk3588: Drop REGULATOR_PWM Kconfig option rockchip: rk3566-anbernic-rgxx3: Remove SPL_ROCKCHIP_BACK_TO_BROM option rockchip: rk35xx: Sort imply statements alphabetically rockchip: rk35xx: Enable random generator rockchip: rk35xx: Imply support for GbE PHY rockchip: rk356x: Imply enhanced features for standard boot rockchip: rk35xx: Sort soc u-boot.dtsi alphabetically rockchip: rk356x: Update bootph props rockchip: rk3588: Update bootph props rockchip: rk3566-pinetab2: Fix reading FIT from SPI flash rockchip: rk3588-coolpi: Add boards to documentation rockchip: rk3588-toybrick: Add missing Kconfig options rockchip: rk3588-turing-rk1: Use dwc3-generic driver rockchip: rk3588-edgeble-neu6: Enable FIT checksum validation rockchip: rk356x-generic: Add support for SPI flash and USB OTG rockchip: rk3588-generic: Add support for USB OTG arch/arm/dts/Makefile | 5 +- .../arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 6 - arch/arm/dts/rk3566-pinetab2-u-boot.dtsi | 24 ++-- arch/arm/dts/rk3566-quartz64-a-u-boot.dtsi | 8 +- arch/arm/dts/rk3566-quartz64-b-u-boot.dtsi | 4 +- arch/arm/dts/rk3568-generic-u-boot.dtsi | 7 + arch/arm/dts/rk3568-generic.dts | 38 +++++- arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 6 +- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 3 +- arch/arm/dts/rk356x-u-boot.dtsi | 125 +++++++++--------- .../arm/dts/rk3588-coolpi-cm5-evb-u-boot.dtsi | 5 +- arch/arm/dts/rk3588-generic-u-boot.dtsi | 22 +++ arch/arm/dts/rk3588-generic.dts | 4 +- arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi | 9 +- .../dts/rk3588-orangepi-5-plus-u-boot.dtsi | 6 +- arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 5 +- arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi | 6 +- arch/arm/dts/rk3588s-coolpi-4b-u-boot.dtsi | 5 +- arch/arm/dts/rk3588s-orangepi-5-u-boot.dtsi | 8 +- arch/arm/dts/rk3588s-u-boot.dtsi | 98 +++++++------- arch/arm/mach-rockchip/Kconfig | 31 +++-- configs/anbernic-rgxx3-rk3566_defconfig | 4 - configs/bpi-r2-pro-rk3568_defconfig | 1 - configs/evb-rk3568_defconfig | 3 +- configs/evb-rk3588_defconfig | 5 +- configs/generic-rk3568_defconfig | 31 +++++ configs/generic-rk3588_defconfig | 17 +++ configs/neu6a-io-rk3588_defconfig | 8 +- configs/neu6b-io-rk3588_defconfig | 8 +- configs/pinetab2-rk3566_defconfig | 2 +- configs/quartzpro64-rk3588_defconfig | 1 - configs/rock5b-rk3588_defconfig | 2 - configs/toybrick-rk3588_defconfig | 6 +- configs/turing-rk1-rk3588_defconfig | 6 +- doc/board/rockchip/rockchip.rst | 2 + drivers/clk/rockchip/clk_rk3568.c | 4 + drivers/clk/rockchip/clk_rk3588.c | 6 + 37 files changed, 332 insertions(+), 199 deletions(-) -- 2.43.2

2 33

[PATCH 0/3] Add support for jtag disable/enable and multiboot get/set for zynq
by lukas.funke-oss＠weidmueller.com 02 Apr '24

02 Apr '24

From: Lukas Funke <lukas.funke(a)weidmueller.com> This series adds support to enable/disable/lock the jtag interface from u-boot. This becomes handy if secure boot is used but debugging should be poissible for non-productions builds. The series also adds support to get/set the multiboot register in order to ensure a freash bootimage search after soft reset. Stefan Herbrechtsmeier (3): zynq: Add get function for multi boot address register zynq: Add function to enable JTAG zynq: Add function to lock JTAG enable bits arch/arm/mach-zynq/cpu.c | 48 ++++++++++++++++++++- arch/arm/mach-zynq/include/mach/hardware.h | 3 +- arch/arm/mach-zynq/include/mach/sys_proto.h | 4 ++ 3 files changed, 52 insertions(+), 3 deletions(-) -- 2.30.2

2 4

[PATCH] arm64: dts: zynqmp: make hw-ecc as the default ecc mode
by Venkatesh Yadav Abbarapu 02 Apr '24

02 Apr '24

Except for Linux no other component (i.e., u-boot, fsbl or BootRom) of the software stack supports software ecc engine. So, make hw-ecc as the default ecc mode. Update the same for mini u-boot nand configuration as well. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- arch/arm/dts/zynqmp-mini-nand.dts | 6 ++++++ arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/zynqmp-mini-nand.dts b/arch/arm/dts/zynqmp-mini-nand.dts index e0517cf460..5889d436ed 100644 --- a/arch/arm/dts/zynqmp-mini-nand.dts +++ b/arch/arm/dts/zynqmp-mini-nand.dts @@ -50,6 +50,12 @@ #size-cells = <1>; arasan,has-mdma; num-cs = <2>; + nand@0 { + reg = <0>; + #address-cells = <2>; + #size-cells = <1>; + nand-ecc-mode = "hw"; + }; }; }; }; diff --git a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts index b97f7ee8d4..48ab619472 100644 --- a/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts +++ b/arch/arm/dts/zynqmp-zc1751-xm017-dc3.dts @@ -136,8 +136,7 @@ reg = <0x0>; #address-cells = <0x2>; #size-cells = <0x1>; - nand-ecc-mode = "soft"; - nand-ecc-algo = "bch"; + nand-ecc-mode = "hw"; nand-rb = <0>; label = "main-storage-0"; nand-ecc-step-size = <1024>; @@ -173,8 +172,7 @@ reg = <0x1>; #address-cells = <0x2>; #size-cells = <0x1>; - nand-ecc-mode = "soft"; - nand-ecc-algo = "bch"; + nand-ecc-mode = "hw"; nand-rb = <0>; label = "main-storage-1"; nand-ecc-step-size = <1024>; -- 2.17.1

2 1

[PATCH v2 1/2] arm64: zynqmp: Generate desc when SPL_FS_LOAD_PAYLOAD_NAME is valid
by Michal Simek 02 Apr '24

02 Apr '24

Generate description only when CONFIG_SPL_FS_LOAD_PAYLOAD_NAME is not empty. When name is empty there is no reason to generate description for it because it is not aligned with dfu rules. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Changes in v2: - New patch is series coming from discussion at https://lore.kernel.org/all/561f9d0ee96ebb6cd674042f269f280ab68fbbac.170870… board/xilinx/zynqmp/zynqmp.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index ba49eb7be229..3844a9c9a8ff 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -661,8 +661,11 @@ void set_dfu_alt_info(char *interface, char *devstr) len += snprintf(buf + len, DFU_ALT_BUF_LEN, ".bin fat %d 1", bootseq); #if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME) - len += snprintf(buf + len, DFU_ALT_BUF_LEN, ";%s fat %d 1", - CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, bootseq); + if (strlen(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)) + len += snprintf(buf + len, DFU_ALT_BUF_LEN, + ";%s fat %d 1", + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, + bootseq); #endif break; case QSPI_MODE_24BIT: @@ -671,10 +674,12 @@ void set_dfu_alt_info(char *interface, char *devstr) "sf 0:0=boot.bin raw %x 0x1500000", multiboot * SZ_32K); #if defined(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME) && defined(CONFIG_SYS_SPI_U_BOOT_OFFS) - len += snprintf(buf + len, DFU_ALT_BUF_LEN, - ";%s raw 0x%x 0x500000", - CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, - multiboot * SZ_32K + CONFIG_SYS_SPI_U_BOOT_OFFS); + if (strlen(CONFIG_SPL_FS_LOAD_PAYLOAD_NAME)) + len += snprintf(buf + len, DFU_ALT_BUF_LEN, + ";%s raw 0x%x 0x500000", + CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, + multiboot * SZ_32K + + CONFIG_SYS_SPI_U_BOOT_OFFS); #endif break; default: -- 2.44.0

1 3