April 2023 - U-Boot

[PATCH] usb: eth: lan78xx: Fix logic in lan78xx_read_otp() to avoid a warning
by Tom Rini 20 Jun '23

20 Jun '23

In lan78xx_read_otp() we want to know if sig is LAN78XX_OTP_INDICATOR_1 or LAN78XX_OTP_INDICATOR_2. In the case of matching the first one we set offset to itself, and clang warns about this. Rework the logic so that if sig is the second indicator we adjust the offset as today and if it does not match the first indicator we return -EINVAL Cc: Marek Vasut <marex(a)denx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- drivers/usb/eth/lan78xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/eth/lan78xx.c b/drivers/usb/eth/lan78xx.c index e34ad2603fbb..d147412990de 100644 --- a/drivers/usb/eth/lan78xx.c +++ b/drivers/usb/eth/lan78xx.c @@ -146,11 +146,9 @@ static int lan78xx_read_otp(struct usb_device *udev, u32 offset, ret = lan78xx_read_raw_otp(udev, 0, 1, &sig); if (!ret) { - if (sig == LAN78XX_OTP_INDICATOR_1) - offset = offset; - else if (sig == LAN78XX_OTP_INDICATOR_2) + if (sig == LAN78XX_OTP_INDICATOR_2) offset += 0x100; - else + else if (sig != LAN78XX_OTP_INDICATOR_1) return -EINVAL; ret = lan78xx_read_raw_otp(udev, offset, length, data); if (ret) -- 2.17.1

2 2

[PATCH] spl: spl-nor: return error if no valid image was loaded
by Mario Kicherer 20 Jun '23

20 Jun '23

If only FIT images are enabled and loading the FIT image fails, spl_nor_load_image() should return an error instead of zero. Without this patch: >>SPL: board_init_r() spl_init Trying to boot from NOR Unsupported OS image.. Jumping nevertheless.. image entry point: 0x0 With patch: >>SPL: board_init_r() spl_init Trying to boot from NOR SPL: failed to boot from all boot devices (err=-6) .### ERROR ### Please RESET the board ### Signed-off-by: Mario Kicherer <dev(a)kicherer.org> --- common/spl/spl_nor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index ffb3566d89..e75127b275 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -120,6 +120,6 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, &hdr); } - return 0; + return -EINVAL; } SPL_LOAD_IMAGE_METHOD("NOR", 0, BOOT_DEVICE_NOR, spl_nor_load_image); -- 2.34.1

2 1

[PATCH] spl: spl_nor: use panic instead of hang if booting fails
by Mario Kicherer 20 Jun '23

20 Jun '23

On systems without a watchdog, using hang() prevents a system to recover from an error. For example, a board could implement a boot counter to switch to an alternative load address after some failed tries. Signed-off-by: Mario Kicherer <dev(a)kicherer.org> --- common/spl/spl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 2855cdd117..d1aa2fb8a9 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -822,11 +822,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2) if (ret) { if (CONFIG_IS_ENABLED(SHOW_ERRORS) && CONFIG_IS_ENABLED(LIBCOMMON_SUPPORT)) - printf(SPL_TPL_PROMPT "failed to boot from all boot devices (err=%d)\n", - ret); + panic(SPL_TPL_PROMPT "failed to boot from all boot devices (err=%d)\n", + ret); else - puts(SPL_TPL_PROMPT "failed to boot from all boot devices\n"); - hang(); + panic_str(SPL_TPL_PROMPT "failed to boot from all boot devices\n"); } spl_perform_fixups(&spl_image); -- 2.34.1

2 1

[PATCH] Revert "lib: sparse: Make CHUNK_TYPE_RAW buffer aligned"
by Gary Bisson 17 Jun '23

17 Jun '23

This reverts commit 62649165cb02ab95b57360bb362886935f524f26. The patch decreased the write performance quite a bit. Here is an example on an i.MX 8M Quad platform. - Before the revert: Sending sparse 'vendor' 1/2 (516436 KB) OKAY [ 5.113s] Writing 'vendor' OKAY [128.335s] Sending sparse 'vendor' 2/2 (76100 KB) OKAY [ 0.802s] Writing 'vendor' OKAY [ 27.902s] - After the revert: Sending sparse 'vendor' 1/2 (516436 KB) OKAY [ 5.310s] Writing 'vendor' OKAY [ 18.041s] Sending sparse 'vendor' 2/2 (76100 KB) OKAY [ 1.244s] Writing 'vendor' OKAY [ 2.663s] Considering that the patch only moves buffer around to avoid a warning message about misaligned buffers, let's keep the best performances. Signed-off-by: Gary Bisson <gary.bisson(a)boundarydevices.com> Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> --- lib/image-sparse.c | 69 ++++++---------------------------------------- 1 file changed, 8 insertions(+), 61 deletions(-) diff --git a/lib/image-sparse.c b/lib/image-sparse.c index 5ec0f94ab3e..d80fdbbf58e 100644 --- a/lib/image-sparse.c +++ b/lib/image-sparse.c @@ -46,66 +46,9 @@ #include <asm/cache.h> #include <linux/math64.h> -#include <linux/err.h> static void default_log(const char *ignored, char *response) {} -static lbaint_t write_sparse_chunk_raw(struct sparse_storage *info, - lbaint_t blk, lbaint_t blkcnt, - void *data, - char *response) -{ - lbaint_t n = blkcnt, write_blks, blks = 0, aligned_buf_blks = 100; - uint32_t *aligned_buf = NULL; - - if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) { - write_blks = info->write(info, blk, n, data); - if (write_blks < n) - goto write_fail; - - return write_blks; - } - - aligned_buf = memalign(ARCH_DMA_MINALIGN, info->blksz * aligned_buf_blks); - if (!aligned_buf) { - info->mssg("Malloc failed for: CHUNK_TYPE_RAW", response); - return -ENOMEM; - } - - while (blkcnt > 0) { - n = min(aligned_buf_blks, blkcnt); - memcpy(aligned_buf, data, n * info->blksz); - - /* write_blks might be > n due to NAND bad-blocks */ - write_blks = info->write(info, blk + blks, n, aligned_buf); - if (write_blks < n) { - free(aligned_buf); - goto write_fail; - } - - blks += write_blks; - data += n * info->blksz; - blkcnt -= n; - } - - free(aligned_buf); - return blks; - -write_fail: - if (IS_ERR_VALUE(write_blks)) { - printf("%s: Write failed, block #" LBAFU " [" LBAFU "] (%lld)\n", - __func__, blk + blks, n, (long long)write_blks); - info->mssg("flash write failure", response); - return write_blks; - } - - /* write_blks < n */ - printf("%s: Write failed, block #" LBAFU " [" LBAFU "]\n", - __func__, blk + blks, n); - info->mssg("flash write failure(incomplete)", response); - return -1; -} - int write_sparse_image(struct sparse_storage *info, const char *part_name, void *data, char *response) { @@ -209,11 +152,15 @@ int write_sparse_image(struct sparse_storage *info, return -1; } - blks = write_sparse_chunk_raw(info, blk, blkcnt, - data, response); - if (blks < 0) + blks = info->write(info, blk, blkcnt, data); + /* blks might be > blkcnt (eg. NAND bad-blocks) */ + if (blks < blkcnt) { + printf("%s: %s" LBAFU " [" LBAFU "]\n", + __func__, "Write failed, block #", + blk, blks); + info->mssg("flash write failure", response); return -1; - + } blk += blks; bytes_written += ((u64)blkcnt) * info->blksz; total_blocks += chunk_header->chunk_sz; -- 2.35.1

4 6

[PATCH] configs: stm32f746-disco: remove a useless comment
by Dario Binacchi 16 Jun '23

16 Jun '23

Commit 8fc78fc73b7f9d ("configs: migrate CONFIG_BMP_16/24/32BPP to defconfigs") made the comment useless. Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> --- include/configs/stm32f746-disco.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 34856d300403..9bf01cac47a4 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -36,6 +36,4 @@ #define CFG_SYS_UBOOT_BASE (CFG_SYS_FLASH_BASE + \ CONFIG_SPL_PAD_TO) -/* For splashcreen */ - #endif /* __CONFIG_H */ -- 2.32.0

3 3

[PATCH] ARM: dts: stm32f769-disco: remove the dsi_host node
by Dario Binacchi 16 Jun '23

16 Jun '23

The node has become useless, as described in the commit 754815b854258 ("video: stm32: remove the compatible "synopsys, dw-mipi-dsi" support") Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> --- arch/arm/dts/stm32f769-disco-u-boot.dtsi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/dts/stm32f769-disco-u-boot.dtsi b/arch/arm/dts/stm32f769-disco-u-boot.dtsi index b5198fddff7c..2c823cce98b4 100644 --- a/arch/arm/dts/stm32f769-disco-u-boot.dtsi +++ b/arch/arm/dts/stm32f769-disco-u-boot.dtsi @@ -28,11 +28,6 @@ button-gpio = <&gpioa 0 0>; }; - dsi_host: dsi_host { - compatible = "synopsys,dw-mipi-dsi"; - status = "okay"; - }; - led1 { compatible = "st,led1"; led-gpio = <&gpioj 5 0>; -- 2.32.0

3 3

[PATCH 0/2] ARM: dts: stm32mp: alignment with v6.3-rc3
by Patrick Delaunay 16 Jun '23

16 Jun '23

Alignment with Linux device tree v6.3-rc3 for STM32MP13x and STM32MP15x STMicroelectronics board and common files, SoC and pincontrol dtsi. I also include the new dt-bindings files video-interfaces.h as it is done in Linux kernel. Patrick Delaunay (2): media: dt-bindings: media: Add macros for video interface bus types ARM: dts: stm32mp: alignment with v6.3-rc3 arch/arm/dts/stm32mp13-pinctrl.dtsi | 138 +++ arch/arm/dts/stm32mp131.dtsi | 993 ++++++++++++++++++- arch/arm/dts/stm32mp133.dtsi | 31 + arch/arm/dts/stm32mp135f-dk.dts | 235 ++++- arch/arm/dts/stm32mp15-pinctrl.dtsi | 50 +- arch/arm/dts/stm32mp151.dtsi | 2 - arch/arm/dts/stm32mp157c-ev1.dts | 18 +- arch/arm/dts/stm32mp15xx-dhcom-som.dtsi | 8 +- arch/arm/dts/stm32mp15xx-dhcor-som.dtsi | 8 +- arch/arm/dts/stm32mp15xx-dkx.dtsi | 10 +- include/dt-bindings/clock/stm32mp13-clks.h | 2 +- include/dt-bindings/media/video-interfaces.h | 16 + include/dt-bindings/reset/stm32mp13-resets.h | 2 +- 13 files changed, 1475 insertions(+), 38 deletions(-) create mode 100644 include/dt-bindings/media/video-interfaces.h -- 2.25.1

4 6

[PATCH v2 0/2] ARM: dts: stm32mp: alignment with v6.3
by Patrick Delaunay 16 Jun '23

16 Jun '23

Alignment with Linux device tree v6.3 for STM32MP13x and STM32MP15x STMicroelectronics board and common files, SoC and pincontrol dtsi. I also include the new dt-bindings files video-interfaces.h as it is done in Linux kernel. Changes in v2: - change commit message and title with v6.3; no new device-tree modification after v6.3-rc3 - add SHA1 for each kernel patch Patrick Delaunay (2): media: dt-bindings: media: Add macros for video interface bus types ARM: dts: stm32mp: alignment with v6.3 arch/arm/dts/stm32mp13-pinctrl.dtsi | 138 +++ arch/arm/dts/stm32mp131.dtsi | 993 ++++++++++++++++++- arch/arm/dts/stm32mp133.dtsi | 31 + arch/arm/dts/stm32mp135f-dk.dts | 235 ++++- arch/arm/dts/stm32mp15-pinctrl.dtsi | 50 +- arch/arm/dts/stm32mp151.dtsi | 2 - arch/arm/dts/stm32mp157c-ev1.dts | 18 +- arch/arm/dts/stm32mp15xx-dhcom-som.dtsi | 8 +- arch/arm/dts/stm32mp15xx-dhcor-som.dtsi | 8 +- arch/arm/dts/stm32mp15xx-dkx.dtsi | 10 +- include/dt-bindings/clock/stm32mp13-clks.h | 2 +- include/dt-bindings/media/video-interfaces.h | 16 + include/dt-bindings/reset/stm32mp13-resets.h | 2 +- 13 files changed, 1475 insertions(+), 38 deletions(-) create mode 100644 include/dt-bindings/media/video-interfaces.h -- 2.25.1

3 6

[PATCH 0/6] stm32mp: soome changes and fixes for STM32MP13 and STM32MP15 boards
by Patrick Delaunay 16 Jun '23

16 Jun '23

Hi, here come some cleanups and fixed for the STM32MP13 and STM32MP15 boards. Patrick Delaunay (6): stm32mp: add support of STM32MP15x Rev.Y stm32mp: bsec: add check on null size in misc ops configs: stm32mp1: reduce DDR_CACHEABLE_SIZE to supported 256MB DDR stm32mp: stm32prog: fix OTP read/write error management stm32mp: stm32prog: use the decimal format by default for offset parsing pmic: stpmic1: support new prefix node name for regulator arch/arm/mach-stm32mp/bsec.c | 4 ++-- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 11 +++++++++-- arch/arm/mach-stm32mp/include/mach/sys_proto.h | 1 + arch/arm/mach-stm32mp/stm32mp15x.c | 5 ++++- configs/stm32mp13_defconfig | 2 +- configs/stm32mp15_defconfig | 2 +- drivers/power/pmic/stpmic1.c | 2 ++ 7 files changed, 20 insertions(+), 7 deletions(-) -- 2.25.1

2 13

[PATCH] bootstd: Make BOOTSTD_FULL depend on BOOTSTD
by Simon Glass 14 Jun '23

14 Jun '23

Move BOOTSTD_FULL down in the file so that it can be enabled only when BOOTSTD is enabled. This prevents a build error if BOOTSTD is disabled but BOOTSTD_FULL is enabled. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- boot/Kconfig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 5f491625c82..47952bbba23 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -371,19 +371,6 @@ config BOOTSTD U-Boot) - bootflow - a description of how to boot (owned by the distro) -config BOOTSTD_FULL - bool "Enhanced features for standard boot" - default y if SANDBOX - help - This enables various useful features for standard boot, which are not - essential for operation: - - - bootdev, bootmeth commands - - extra features in the bootflow command - - support for selecting the ordering of bootmeths ("bootmeth order") - - support for selecting the ordering of bootdevs using the devicetree - as well as the "boot_targets" environment variable - config SPL_BOOTSTD bool "Standard boot support in VPL" depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK @@ -406,6 +393,19 @@ config VPL_BOOTSTD if BOOTSTD +config BOOTSTD_FULL + bool "Enhanced features for standard boot" + default y if SANDBOX + help + This enables various useful features for standard boot, which are not + essential for operation: + + - bootdev, bootmeth commands + - extra features in the bootflow command + - support for selecting the ordering of bootmeths ("bootmeth order") + - support for selecting the ordering of bootdevs using the devicetree + as well as the "boot_targets" environment variable + config BOOTSTD_DEFAULTS bool "Select some common defaults for standard boot" depends on BOOTSTD -- 2.39.2.637.g21b0678d19-goog

3 2