October 2024 - U-Boot

[PATCH v1 0/4] x86: Clean up and fix to avoid compiler warnings
by Andy Shevchenko 18 Oct '24

18 Oct '24

Some fixes to avoid compiler warnings with `make W=1`. The idea to continue this for at least some of the x86 related code. Andy Shevchenko (4): x86: cpu: Use default print_cpuinfo() for all x86: cpu: Mark a few functions static x86: cpu: Add a few prototypes to the header file x86: cpu: Add missing header inclusion arch/x86/cpu/broadwell/cpu.c | 12 ------------ arch/x86/cpu/coreboot/coreboot.c | 5 ----- arch/x86/cpu/cpu.c | 8 ++++++-- arch/x86/cpu/cpu_x86.c | 1 + arch/x86/cpu/efi/app.c | 5 ----- arch/x86/cpu/efi/payload.c | 5 ----- arch/x86/cpu/i386/interrupt.c | 2 +- arch/x86/cpu/ivybridge/cpu.c | 14 -------------- arch/x86/cpu/mtrr.c | 2 +- arch/x86/cpu/qemu/qemu.c | 6 ------ arch/x86/cpu/quark/quark.c | 6 ------ arch/x86/cpu/slimbootloader/slimbootloader.c | 5 ----- arch/x86/cpu/tangier/tangier.c | 5 ----- arch/x86/cpu/x86_64/misc.c | 5 ----- arch/x86/include/asm/cpu.h | 7 +++++++ arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/fsp/fsp_common.c | 6 ------ 17 files changed, 16 insertions(+), 79 deletions(-) -- 2.43.0.rc1.1336.g36b5255a03ac

2 19

[PATCH] binman: Add option for pointing to external description
by Michal Simek 18 Oct '24

18 Oct '24

Adding binman node with target images description can be unwanted feature but as of today there is no way to disable it. Also on size constrained systems it is not useful to add binman description to DTB. Introduce BINMAN_EXTERNAL_DTB Kconfig symbol which allows separate DTB for target from DTB for binman itself. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Makefile | 2 +- lib/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af24de4165e4..8043016ac279 100644 --- a/Makefile +++ b/Makefile @@ -1384,7 +1384,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(foreach f,$(BINMAN_TOOLPATHS),--toolpath $(f)) \ --toolpath $(objtree)/tools \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ - build -u -d u-boot.dtb -O . -m \ + build -u -d $(CONFIG_BINMAN_EXTERNAL_DTB) -O . -m \ --allow-missing $(if $(BINMAN_ALLOW_MISSING),--ignore-missing) \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ $(foreach f,$(of_list_dirs),-I $(f)) -a of-list=$(of_list) \ diff --git a/lib/Kconfig b/lib/Kconfig index 1448b4ac2d64..491f265012b8 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -45,6 +45,16 @@ config BINMAN_FDT locate entries in the firmware image. See binman.h for the available functionality. +config BINMAN_EXTERNAL_DTB + string "External binman description" + depends on BINMAN + default "u-boot.dtb" + help + This enables option to point to different DTB file with binman node which + is outside of DTB used by the firmware. Use this option if information + about generated images shouldn't be the part of target binary. Or on system + with limited storage. + config CC_OPTIMIZE_LIBS_FOR_SPEED bool "Optimize libraries for speed" help -- 2.43.0

3 11

[PATCH 0/8] membuff: Add tests and update to support a flag for empty/full
by Simon Glass 18 Oct '24

18 Oct '24

The membuff implementation curently has no tests. It also assumes that head and tail can never correspond unless the buffer is empty. This series provides a compile-time flag to support a 'full' flag. It also adds some tests of the main routines. The data structure is also renamed to membuf which fits better with U-Boot. There may be some cases in the code which could be optimised a little, but the implementation is functional. Simon Glass (8): membuff: Rename functions to have membuf_ prefix membuff: Rename the files to membuf membuf: Rename struct membuf: Include stdbool membuf: Correct implementation of membuf_dispose() membuf: Add some tests membuf: Minor code-style improvements membuf: Support a flag for being full MAINTAINERS | 7 + arch/sandbox/include/asm/serial.h | 2 +- boot/bootmeth_extlinux.c | 8 +- common/console.c | 32 ++-- drivers/serial/sandbox.c | 10 +- drivers/usb/emul/sandbox_keyb.c | 8 +- include/asm-generic/global_data.h | 6 +- include/{membuff.h => membuf.h} | 98 ++++++------ lib/Makefile | 2 +- lib/{membuff.c => membuf.c} | 134 ++++++++++------ test/lib/Makefile | 1 + test/lib/membuf.c | 244 ++++++++++++++++++++++++++++++ 12 files changed, 427 insertions(+), 125 deletions(-) rename include/{membuff.h => membuf.h} (67%) rename lib/{membuff.c => membuf.c} (69%) create mode 100644 test/lib/membuf.c -- 2.34.1

2 10

[PATCH 1/1] efi_loader: remove ERROR:, WARNING: prefixes in messages
by Heinrich Schuchardt 18 Oct '24

18 Oct '24

We should not write "ERROR:" or "WARNING:" when using log_err() or log_warning(). These prefixed don't provide additional information. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index a481eb4b7e3..00167bd2a10 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -412,7 +412,7 @@ static efi_status_t copy_fdt(void **fdtp) EFI_ACPI_RECLAIM_MEMORY, fdt_pages, &new_fdt_addr); if (ret != EFI_SUCCESS) { - log_err("ERROR: Failed to reserve space for FDT\n"); + log_err("Failed to reserve space for FDT\n"); goto done; } new_fdt = (void *)(uintptr_t)new_fdt_addr; @@ -468,7 +468,7 @@ efi_status_t efi_install_fdt(void *fdt) * but not both. */ if (CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) && fdt) - log_warning("WARNING: Can't have ACPI table and device tree - ignoring DT.\n"); + log_warning("Can't have ACPI table and device tree - ignoring DT.\n"); if (fdt == EFI_FDT_USE_INTERNAL) { const char *fdt_opt; @@ -483,13 +483,13 @@ efi_status_t efi_install_fdt(void *fdt) if (!fdt_opt) { fdt_opt = env_get("fdtcontroladdr"); if (!fdt_opt) { - log_err("ERROR: need device tree\n"); + log_err("need device tree\n"); return EFI_NOT_FOUND; } } fdt_addr = hextoul(fdt_opt, NULL); if (!fdt_addr) { - log_err("ERROR: invalid $fdt_addr or $fdtcontroladdr\n"); + log_err("invalid $fdt_addr or $fdtcontroladdr\n"); return EFI_LOAD_ERROR; } fdt = map_sysmem(fdt_addr, 0); @@ -497,7 +497,7 @@ efi_status_t efi_install_fdt(void *fdt) /* Install device tree */ if (fdt_check_header(fdt)) { - log_err("ERROR: invalid device tree\n"); + log_err("invalid device tree\n"); return EFI_LOAD_ERROR; } @@ -510,12 +510,12 @@ efi_status_t efi_install_fdt(void *fdt) /* Prepare device tree for payload */ ret = copy_fdt(&fdt); if (ret) { - log_err("ERROR: out of memory\n"); + log_err("out of memory\n"); return EFI_OUT_OF_RESOURCES; } if (image_setup_libfdt(&img, fdt, false)) { - log_err("ERROR: failed to process device tree\n"); + log_err("failed to process device tree\n"); return EFI_LOAD_ERROR; } @@ -527,7 +527,7 @@ efi_status_t efi_install_fdt(void *fdt) if (CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL_MEASURE_DTB)) { ret = efi_tcg2_measure_dtb(fdt); if (ret == EFI_SECURITY_VIOLATION) { - log_err("ERROR: failed to measure DTB\n"); + log_err("failed to measure DTB\n"); return ret; } } @@ -535,7 +535,7 @@ efi_status_t efi_install_fdt(void *fdt) /* Install device tree as UEFI table */ ret = efi_install_configuration_table(&efi_guid_fdt, fdt); if (ret != EFI_SUCCESS) { - log_err("ERROR: failed to install device tree\n"); + log_err("failed to install device tree\n"); return ret; } @@ -574,7 +574,7 @@ efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options) */ ret = efi_set_watchdog(300); if (ret != EFI_SUCCESS) { - log_err("ERROR: Failed to set watchdog timer\n"); + log_err("failed to set watchdog timer\n"); goto out; } -- 2.45.2

3 2

[PATCH 1/1] efi_loader: add missing lf in error message
by Heinrich Schuchardt 18 Oct '24

18 Oct '24

Messages written with log_err() should terminate with a linefeed. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index b63b5cca71e..3d742fa1915 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -652,7 +652,7 @@ void *efi_alloc(size_t size) if (efi_allocate_pool(EFI_BOOT_SERVICES_DATA, size, &buf) != EFI_SUCCESS) { - log_err("out of memory"); + log_err("out of memory\n"); return NULL; } memset(buf, 0, size); -- 2.45.2

3 2

[PATCH v2] usb: dwc3-generic: use DR_MODE_OTG when dr_mode isn't specified
by Neil Armstrong 18 Oct '24

18 Oct '24

The USB DRD bindingsa at [1] are clear, if not specified the dr_mode property defaults to otg, and this is how Linux behaves. A cleanup is ongoing on the Linux Device Trees to remove dr_mode when set to "otg", so take this in account and do not fail anymore when dr_mode isn't specified in the glue or dwc3 node. On the software side, the Linux DWC3 driver behavior defaulting to DR_MODE_OTG is present since v3.12-rc1 added in commit [2]. [1] https://www.kernel.org/doc/Documentation/devicetree/bindings/usb/usb-drd.ya… [2] commit a45c82b84c844 ("usb: dwc3: adapt to use dr_mode device tree helper") https://github.com/torvalds/linux/commit/a45c82b84c844cd85b2ed1aa32596f1bff… Reviewed-by: Caleb Connolly <caleb.connolly(a)linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Changes in v2: - add ref to linux behaviour - Link to v1: https://lore.kernel.org/r/20241016-topic-usb-dwc3-dr-mode-otg-v1-1-4fda5607… --- drivers/usb/dwc3/dwc3-generic.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 2ab41cbae45d78ad140d54e602150b6ddd0a3b99..d62d687ece36d70ccb0f7541eb51c6b7550d932d 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -183,10 +183,10 @@ static int dwc3_generic_of_to_plat(struct udevice *dev) /* might be a leaf so check the parent for mode */ node = dev_ofnode(dev->parent); plat->dr_mode = usb_get_dr_mode(node); - if (plat->dr_mode == USB_DR_MODE_UNKNOWN) { - pr_err("Invalid usb mode setup\n"); - return -ENODEV; - } + + /* If none of the nodes have dr_mode, bindings says default is OTG */ + if (!plat->dr_mode) + plat->dr_mode = USB_DR_MODE_OTG; } return 0; @@ -527,6 +527,10 @@ static int dwc3_glue_bind_common(struct udevice *parent, ofnode node) if (!dr_mode) dr_mode = usb_get_dr_mode(node); + /* If none of the nodes have dr_mode, bindings says default is OTG */ + if (!dr_mode) + dr_mode = USB_DR_MODE_OTG; + if (CONFIG_IS_ENABLED(DM_USB_GADGET) && (dr_mode == USB_DR_MODE_PERIPHERAL || dr_mode == USB_DR_MODE_OTG)) { debug("%s: dr_mode: OTG or Peripheral\n", __func__); --- base-commit: d5cab0d6adc26ec1bbd45c2fed101184d04454ae change-id: 20241016-topic-usb-dwc3-dr-mode-otg-88ec307e0970 Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

1 0

[GIT PULL] Please pull u-boot-imx-master-20241018
by Fabio Estevam 18 Oct '24

18 Oct '24

Hi Tom, Please pull from u-boot-imx/master, thanks. The following changes since commit 608a31bdec6284ad6f821226e4c62c9cd3052874: Merge patch series "Introduce the lwIP network stack" (2024-10-16 11:11:57 -0600) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20241018 for you to fetch changes up to fd3f2e3f0edc1f87be4c5a39a0c81037d551c069: cpu: imx8_cpu: Avoid revision to corrupt device tree (2024-10-18 08:02:30 -0300) u-boot-imx-master-20241018 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22796 - Switch to using upstream DT on DH i.MX8MP DHCOM PDK2/PDK3. - Add ability to build fallback DTBOs from arch/$(ARCH)/dts. - Remove fdt_high and initrd_high env variables from imx6-dhcom. - Add dummy clk for imx8. - Fix DT corruption in imx8_cpu. - Improve DDR stability on pico-imx7d. ---------------------------------------------------------------- From: Marek Vasut (1): arm64: dts: imx: Switch to using upstream DT on DH i.MX8MP DHCOM PDK2/PDK3 Marek Vasut (2): dts: Add ability to build fallback DTBOs from arch/$(ARCH)/dts ARM: dts: imx6-dhcom: Remove fdt_high and initrd_high env variables Peng Fan (2): clk: imx8: Add dummy clk cpu: imx8_cpu: Avoid revision to corrupt device tree Ray Chang (1): pico-imx7d: Increase ODT resistor value Makefile | 4 + arch/arm/dts/Makefile | 2 - arch/arm/dts/imx8mp-dhcom-pdk2.dts | 158 ------------------ arch/arm/dts/imx8mp-dhcom-pdk3.dts | 317 ------------------------------------ board/technexion/pico-imx7d/spl.c | 10 +- configs/imx8mp_dhcom_pdk2_defconfig | 6 +- configs/imx8mp_dhcom_pdk3_defconfig | 6 +- drivers/clk/imx/clk-imx8qm.c | 4 + drivers/clk/imx/clk-imx8qxp.c | 4 + drivers/cpu/imx8_cpu.c | 32 ++-- dts/Kconfig | 16 ++ dts/Makefile | 14 +- include/configs/dh_imx6.h | 3 +- scripts/Makefile.dts | 6 + 14 files changed, 78 insertions(+), 504 deletions(-) delete mode 100644 arch/arm/dts/imx8mp-dhcom-pdk2.dts delete mode 100644 arch/arm/dts/imx8mp-dhcom-pdk3.dts

1 1

[PATCH] ARM: dts: imx6-dhcom: Remove fdt_high and initrd_high env variables
by Marek Vasut 18 Oct '24

18 Oct '24

Remove both "fdt_high" and "initrd_high" environment variables in favor of "bootm_size" to safely contain a kernel, device tree and initrd for relocation inside of 256 MiB region of DRAM. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andreas Geisreiter <ageisreiter(a)dh-electronics.de> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de --- NOTE: If mainline Linux does not boot, this is the prime suspect. Non-8-byte aligned DT address is then a dead giveaway: Booting using the fdt blob at 0x126d6bac ^ --- include/configs/dh_imx6.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 9b6f03f6856..09354936d73 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -36,10 +36,9 @@ #endif #define CFG_EXTRA_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ "console=ttymxc0,115200\0" \ "fdt_addr=0x18000000\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ "kernel_addr_r=0x10008000\0" \ "fdt_addr_r=0x13000000\0" \ "ramdisk_addr_r=0x18000000\0" \ -- 2.45.2

2 2

[PATCH] clk: imx8: Add dummy clk
by Peng Fan (OSS) 18 Oct '24

18 Oct '24

From: Peng Fan <peng.fan(a)nxp.com> There is a dummy clk entry for i.MX8QM/QXP, so add the dummy clk enable and get rate. Otherwise "__imx8_clk_enable(Invalid clk ID #0)". Fixes: 76332fae769 ("mmc: fsl_esdhc_imx: Enable AHB/IPG clk with clk bulk API") Reviewed-by: Heiko Schocher <hs(a)denx.de> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/clk/imx/clk-imx8qm.c | 4 ++++ drivers/clk/imx/clk-imx8qxp.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c index 62fed7e3e32..466d71786cf 100644 --- a/drivers/clk/imx/clk-imx8qm.c +++ b/drivers/clk/imx/clk-imx8qm.c @@ -48,6 +48,8 @@ ulong imx8_clk_get_rate(struct clk *clk) debug("%s(#%lu)\n", __func__, clk->id); switch (clk->id) { + case IMX8QM_CLK_DUMMY: + return 0; case IMX8QM_A53_DIV: resource = SC_R_A53; pm_clk = SC_PM_CLK_CPU; @@ -264,6 +266,8 @@ int __imx8_clk_enable(struct clk *clk, bool enable) debug("%s(#%lu)\n", __func__, clk->id); switch (clk->id) { + case IMX8QM_CLK_DUMMY: + return 0; case IMX8QM_I2C0_IPG_CLK: case IMX8QM_I2C0_CLK: case IMX8QM_I2C0_DIV: diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c index 18bdc08971b..79098623bc8 100644 --- a/drivers/clk/imx/clk-imx8qxp.c +++ b/drivers/clk/imx/clk-imx8qxp.c @@ -51,6 +51,8 @@ ulong imx8_clk_get_rate(struct clk *clk) debug("%s(#%lu)\n", __func__, clk->id); switch (clk->id) { + case IMX8QXP_CLK_DUMMY: + return 0; case IMX8QXP_A35_DIV: resource = SC_R_A35; pm_clk = SC_PM_CLK_CPU; @@ -248,6 +250,8 @@ int __imx8_clk_enable(struct clk *clk, bool enable) debug("%s(#%lu)\n", __func__, clk->id); switch (clk->id) { + case IMX8QXP_CLK_DUMMY: + return 0; case IMX8QXP_I2C0_CLK: case IMX8QXP_I2C0_IPG_CLK: resource = SC_R_I2C_0; -- 2.35.3

3 2

[PATCH v2] pico-imx7d: Increase ODT resistor value
by egyszeregy＠freemail.hu 18 Oct '24

18 Oct '24

From: Ray Chang <ray.chang(a)technexion.com> Increase ODT resistor value from 60 to 120 ohm to improve DRAM stability. Based on the following commit from TechNexion U-Boot: https://github.com/TechNexion/u-boot-tn-imx/commit/8a00e57b697c6f7d3d3abcfc… Signed-off-by: Ray Chang <ray.chang(a)technexion.com> Signed-off-by: Benjamin Szőke <egyszeregy(a)freemail.hu> --- board/technexion/pico-imx7d/spl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c index cb60d3be42..fc97c58ae1 100644 --- a/board/technexion/pico-imx7d/spl.c +++ b/board/technexion/pico-imx7d/spl.c @@ -89,11 +89,11 @@ static struct ddr_phy ddr_phy_regs_val = { static struct mx7_calibration calib_param = { .num_val = 5, .values = { - 0x0E407304, - 0x0E447304, - 0x0E447306, - 0x0E447304, - 0x0E447304, + 0x0E207304, + 0x0E247304, + 0x0E247306, + 0x0E247304, + 0x0E207304, }, }; -- 2.47.0.windows.1

2 1