January 2025 - U-Boot

[PATCH v2] board: xilinx: Add missing prototype for set_dfu_alt_info
by Venkatesh Yadav Abbarapu 14 Jan '25

14 Jan '25

Add missing prototype to fix the sparse warning, warning: no previous prototype for 'set_dfu_alt_info' [-Wmissing-prototypes]. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> --- Changes in v2: - Include dfu.h and remove the set_dfu_alt_info declaration from board.h. --- board/xilinx/versal/board.c | 1 + 1 file changed, 1 insertion(+) diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index fd5c6ced79..c0477e6574 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -6,6 +6,7 @@ #include <command.h> #include <cpu_func.h> +#include <dfu.h> #include <env.h> #include <fdtdec.h> #include <init.h> -- 2.34.1

2 1

[PATCH] arm64: zynqmp: Add eeprom labels for System Controller dts
by Michal Simek 14 Jan '25

14 Jan '25

From: Jonathan Stroud <jonathan.stroud(a)amd.com> Label all eeproms so we can open by label rather than a fixed i2c address. Signed-off-by: Jonathan Stroud <jonathan.stroud(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 4 ++++ arch/arm/dts/zynqmp-sc-revB.dts | 1 + 2 files changed, 5 insertions(+) diff --git a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts index 4e0587fd441a..6e2d9542012a 100644 --- a/arch/arm/dts/zynqmp-e-a2197-00-revA.dts +++ b/arch/arm/dts/zynqmp-e-a2197-00-revA.dts @@ -494,6 +494,7 @@ /* Use for storing information about SC board */ eeprom: eeprom@54 { /* u34 - m24128 16kB */ compatible = "st,24c128", "atmel,24c128"; + label = "eeprom_cc"; reg = <0x54>; /* 0x5c too */ }; si570_ref_clk: clock-generator@5d { /* u32 */ @@ -509,6 +510,7 @@ /* and connector J212D */ eeprom_ebm: eeprom@52 { /* x-ebm module */ compatible = "st,24c128", "atmel,24c128"; + label = "eeprom_ebm"; reg = <0x52>; }; }; @@ -520,6 +522,7 @@ /* expected eeprom 0x50 FMC cards */ eeprom_fmc1: eeprom@50 { compatible = "st,24c128", "atmel,24c128"; + label = "eeprom_fmc1"; reg = <0x50>; }; }; @@ -531,6 +534,7 @@ /* expected eeprom 0x50 FMC cards */ eeprom_fmc2: eeprom@50 { compatible = "st,24c128", "atmel,24c128"; + label = "eeprom_fmc2"; reg = <0x50>; }; }; diff --git a/arch/arm/dts/zynqmp-sc-revB.dts b/arch/arm/dts/zynqmp-sc-revB.dts index c4f70581695d..6f5856017bf3 100644 --- a/arch/arm/dts/zynqmp-sc-revB.dts +++ b/arch/arm/dts/zynqmp-sc-revB.dts @@ -175,6 +175,7 @@ /* Use for storing information about SC board */ eeprom: eeprom@54 { /* u34 - m24128 16kB */ compatible = "st,24c128", "atmel,24c128"; + label = "eeprom_cc"; reg = <0x54>; /* & 0x5c */ bootph-all; }; -- 2.43.0

1 1

[PATCH] arm64: zynqmp: Enable iio-hwmon description only for SOM
by Michal Simek 14 Jan '25

14 Jan '25

Description is coming from SOM only that's why enable it only on SOM. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/arm/dts/zynqmp-sm-k26-revA.dts | 4 ++++ arch/arm/dts/zynqmp.dtsi | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/zynqmp-sm-k26-revA.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts index b514dc27f710..70acd3eb88b8 100644 --- a/arch/arm/dts/zynqmp-sm-k26-revA.dts +++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts @@ -97,6 +97,10 @@ }; }; +&ams { + status = "okay"; +}; + &modepin_gpio { label = "modepin"; }; diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index e8750b08162d..0e0436ecce82 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -393,8 +393,9 @@ }; }; - ams { + ams: ams { compatible = "iio-hwmon"; + status = "disabled"; io-channels = <&xilinx_ams 0>, <&xilinx_ams 1>, <&xilinx_ams 2>, <&xilinx_ams 3>, <&xilinx_ams 4>, <&xilinx_ams 5>, <&xilinx_ams 6>, <&xilinx_ams 7>, <&xilinx_ams 8>, -- 2.43.0

1 1

[PATCH v2 0/1] SoCFPGA: Add watchdog mode setting for Agilex 5
by muhammad.hazim.izzat.zamri＠intel.com 14 Jan '25

14 Jan '25

From: Muhammad Hazim Izzat Zamri <muhammad.hazim.izzat.zamri(a)intel.com> This patch is to introduce another watchdog mode setting in Agilex 5 as additional watchdog4 has been introduced. This is to enable the debug mode when the CPU is paused by the user. This patch has been tested on Agilex 5 devkit with QSPI boot (UBI/UBIFS) and RAM boot (TFTP & ARM DS debugger). Muhammad Hazim Izzat Zamri (1): arm: socfpga:agilex5: Fix system manager watchdog mode setting arch/arm/mach-socfpga/include/mach/system_manager_soc64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.26.2

2 2

[PATCH v2 0/6] efi_loader: run bootdev_hunt() to find ESP
by Heinrich Schuchardt 14 Jan '25

14 Jan '25

When initializing the EFI sub-system we need all block devices and the NIC to be probed. Extensions should have been applied to the device-tree. Our current implementation only guarantees that bound block devices are probed. But this misses out devices where binding requires specific routines to be executed, e.g. NVMe (nvme scan), SCSI (scsi start). Invoking bootdev_hunt() allows to find all block devices, probe the network nic, and enable extensions. Reviewers complained that PXE boot was executed unexpectedly with a patch that only added the bootdev_hunt() call to the EFI sub-system initialization. The EFI sub-system does not require the IP address to be set up. We can reduce the boottime by not executing dchp_run() in eth_bootdev_hunt(). Furthermore on the legacy network stack with autostart=yes dhcp_run() tries to download the boot file via TFTP and execute it which seems to be a problem with non-observance of autoload=no. To fix Gitlab CI issues the following changes are necessary: In test_extension.py do not assume that extensions have not been loaded by bootdev hunter in a previous test. Remove CONFIG_AMIGA_PARTITION from sandbox_deconfig to avoid a timeout. Remove CONFIG_USB_DWC3 on the CI from xilinx_versal_virt_defconfig to avoid a boot failure. Add a parameter '-e' to select if UEFI boot options shall be shown by the bootmenu command. v2: disable USB_DWC3 only in CI update commit message for eth_bootdev_hunt() change Heinrich Schuchardt (6): test: fix test_extension.py configs: sandbox_deconfig: remove CONFIG_AMIGA_PARTITION CI: xilinx_versal_virt: disable USB_DWC3 net: eth_bootdev_hunt() must not try to boot cmd: bootmenu: add parameter -e for UEFI boot options efi_loader: run bootdev_hunt() to find ESP .azure-pipelines.yml | 1 + .gitlab-ci.yml | 1 + cmd/bootmenu.c | 39 +++++++++++++++++++++++++-------- configs/sandbox_defconfig | 1 - doc/usage/cmd/bootmenu.rst | 13 ++++++++--- lib/efi_loader/efi_setup.c | 8 +++++++ net/eth_bootdev.c | 30 +++++++++++++++---------- test/py/tests/test_extension.py | 4 +++- 8 files changed, 71 insertions(+), 26 deletions(-) -- 2.45.2

5 23

[PATCH v4 1/3] bloblist: add api to get blob with size
by Raymond Mao 13 Jan '25

13 Jan '25

bloblist_find function only returns the pointer of blob data, which is fine for those self-describing data like FDT. But as a common scenario, an interface is needed to retrieve both the pointer and the size of the blob data. Add a few ut test cases for the new api. Signed-off-by: Raymond Mao <raymond.mao(a)linaro.org> Reviewed-by: Simon Glass <sjg(a)chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes in v2 - Rename function argument. - Add ut tests. Changes in v3 - None. Changes in v4 - None. common/bloblist.c | 17 +++++++++++++++-- include/bloblist.h | 18 ++++++++++++++++++ test/common/bloblist.c | 4 ++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/common/bloblist.c b/common/bloblist.c index 110bb9dc44..ab48a3cdb9 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -222,14 +222,27 @@ static int bloblist_ensurerec(uint tag, struct bloblist_rec **recp, int size, } void *bloblist_find(uint tag, int size) +{ + void *blob = NULL; + int blob_size; + + blob = bloblist_get_blob(tag, &blob_size); + + if (size && size != blob_size) + return NULL; + + return blob; +} + +void *bloblist_get_blob(uint tag, int *sizep) { struct bloblist_rec *rec; rec = bloblist_findrec(tag); if (!rec) return NULL; - if (size && size != rec->size) - return NULL; + + *sizep = rec->size; return (void *)rec + rec_hdr_size(rec); } diff --git a/include/bloblist.h b/include/bloblist.h index f999391f74..52ba0ddcf8 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -250,6 +250,24 @@ static inline void *bloblist_check_magic(ulong addr) return ptr; } +#if CONFIG_IS_ENABLED(BLOBLIST) +/** + * bloblist_get_blob() - Find a blob and get the size of it + * + * Searches the bloblist and returns the blob with the matching tag + * + * @tag: Tag to search for (enum bloblist_tag_t) + * @sizep: Size of the blob found + * Return: pointer to bloblist if found, or NULL if not found + */ +void *bloblist_get_blob(uint tag, int *sizep); +#else +static inline void *bloblist_get_blob(uint tag, int *sizep) +{ + return NULL; +} +#endif + /** * bloblist_find() - Find a blob * diff --git a/test/common/bloblist.c b/test/common/bloblist.c index 4bca62110a..324127596f 100644 --- a/test/common/bloblist.c +++ b/test/common/bloblist.c @@ -98,10 +98,12 @@ static int bloblist_test_blob(struct unit_test_state *uts) struct bloblist_hdr *hdr; struct bloblist_rec *rec, *rec2; char *data; + int size = 0; /* At the start there should be no records */ hdr = clear_bloblist(); ut_assertnull(bloblist_find(TEST_TAG, TEST_BLOBLIST_SIZE)); + ut_assertnull(bloblist_get_blob(TEST_TAG, &size)); ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0, 0)); ut_asserteq(sizeof(struct bloblist_hdr), bloblist_get_size()); ut_asserteq(TEST_BLOBLIST_SIZE, bloblist_get_total_size()); @@ -114,6 +116,8 @@ static int bloblist_test_blob(struct unit_test_state *uts) ut_asserteq_addr(rec + 1, data); data = bloblist_find(TEST_TAG, TEST_SIZE); ut_asserteq_addr(rec + 1, data); + ut_asserteq_addr(bloblist_get_blob(TEST_TAG, &size), data); + ut_asserteq(size, TEST_SIZE); /* Check the data is zeroed */ ut_assertok(check_zero(data, TEST_SIZE)); -- 2.25.1

3 13

[PULL] u-boot-usb/master
by Marek Vasut 13 Jan '25

13 Jan '25

The following changes since commit e13e0a921f444cc12127c8a497dcc476f1268939: Merge tag 'efi-next-20250105' of https://source.denx.de/u-boot/custodians/u-boot-efi (2025-01-08 18:05:51 -0600) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 801b5fafd35db53f229bde5e2eb7d290e5d172e7: usb: ehci-mx6: Add i.MX95 support (2025-01-13 04:39:05 +0100) ---------------------------------------------------------------- Marek Vasut (3): usb: ehci-mx5: Use regulator_set_enable_if_allowed usb: ehci-mx6: Use regulator_set_enable_if_allowed usb: ehci-mx6: Add i.MX95 support drivers/usb/host/Kconfig | 10 +++++----- drivers/usb/host/ehci-mx5.c | 6 +++--- drivers/usb/host/ehci-mx6.c | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-)

2 1

[PULL] u-boot-sh/master
by Marek Vasut 13 Jan '25

13 Jan '25

The following changes since commit bc157bb6667ed97e33be8ce8436c28baa275b295: Merge tag 'u-boot-rockchip-20250110' of https://source.denx.de/u-boot/custodians/u-boot-rockchip (2025-01-10 18:56:22 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-sh.git master for you to fetch changes up to 46a7999160da3167497e08a444417aea26171197: arm64: renesas: Convert boards over to is_cortex_a() functions (2025-01-12 23:49:58 +0100) ---------------------------------------------------------------- Marek Vasut (3): arm64: Convert core type check macros into inline functions arm64: Add MIDR entries for Cortex-A57 and Cortex-A76 arm64: renesas: Convert boards over to is_cortex_a() functions arch/arm/include/asm/armv8/cpu.h | 32 +++++++++++++++++++++----------- board/hoperun/hihope-rzg2/hihope-rzg2.c | 8 ++------ board/renesas/rcar-common/gen3-common.c | 10 +++------- 3 files changed, 26 insertions(+), 24 deletions(-)

2 1

[PATCH v1] usb: dwc3: core: Fix timeout check
by Varadarajan Narayanan 13 Jan '25

13 Jan '25

dwc3_core_init loops 'timeout' times to check if the IP block is out of reset using 'while (timeout--)'. If there is some issue and the block doesn't come out of reset, the loop will run till 'timeout' becomes zero and the post decrement operator would set timeout to 0xffffffff. Though the IP block is not out reset, the subsequent if check 'if !timeout' would fail as timeout is not equal to zero and the function proceeds with the initialization. Make this a pre decrement to address this. Signed-off-by: Varadarajan Narayanan <quic_varada(a)quicinc.com> --- drivers/usb/dwc3/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index a35b8c2f64..8f58e4ea2d 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -612,7 +612,7 @@ static int dwc3_core_init(struct dwc3 *dwc) /* issue device SoftReset too */ timeout = 5000; dwc3_writel(dwc->regs, DWC3_DCTL, DWC3_DCTL_CSFTRST); - while (timeout--) { + while (--timeout) { reg = dwc3_readl(dwc->regs, DWC3_DCTL); if (!(reg & DWC3_DCTL_CSFTRST)) break; -- 2.34.1

3 4

[PATCH] arm64: renesas: Rewrite u-boot-elf.srec base address if PIE for R-Car Gen3
by Marek Vasut 12 Jan '25

12 Jan '25

The flash_writer tool and previous recovery tools require the SREC load address to be 0x5000_0000 . The PIE U-Boot build sets the address to 0x0 instead, so override the address back to make u-boot-elf.srec compatible with the recovery tools. Tested-by: Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se> Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Niklas Söderlund <niklas.soderlund+renesas(a)ragnatech.se> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 0500eb6e0a7..c7318950f33 100644 --- a/Makefile +++ b/Makefile @@ -1286,6 +1286,15 @@ u-boot.hex u-boot.srec: u-boot FORCE OBJCOPYFLAGS_u-boot-elf.srec := $(OBJCOPYFLAGS_u-boot.srec) +ifeq ($(CONFIG_POSITION_INDEPENDENT)$(CONFIG_RCAR_GEN3),yy) +# The flash_writer tool and previous recovery tools +# require the SREC load address to be 0x5000_0000 . +# The PIE U-Boot build sets the address to 0x0, so +# override the address back to make u-boot-elf.srec +# compatible with the recovery tools. +OBJCOPYFLAGS_u-boot-elf.srec += --change-addresses=0x50000000 +endif + u-boot-elf.srec: u-boot.elf FORCE $(call if_changed,objcopy) -- 2.45.2

1 0