u-boot.git, branch v2026.01-rc5 Unnamed repository; edit this file 'description' to name the repository. Prepare v2026.01-rc5 2025-12-22T22:26:11+00:00 Tom Rini trini@konsulko.com 2025-12-22T22:26:11+00:00 0f6ff53d55ba254de8a995c2a2f5a313acd40ac7 Signed-off-by: Tom Rini <trini@konsulko.com> 
Signed-off-by: Tom Rini <trini@konsulko.com>
drivers: scsi: fix double decrement of block count in 64-bit LBA path 2025-12-22T22:19:39+00:00 Balaji Selvanathan balaji.selvanathan@oss.qualcomm.com 2025-12-22T09:01:05+00:00 c0add0039825fbd40620284c202f7c4569154605 The scsi_read function incorrectly decrements the block count twice when handling large disks that trigger the CONFIG_SYS_64BIT_LBA code path (reads beyond block 268,435,455). The variable 'blks' was being decremented both inside the 64-bit LBA block and after the successful scsi_exec() call, causing incorrect block count tracking and data abort errors on large capacity disks. Signed-off-by: Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com> Tested-by: Tony Dinh <mibodhi@gmail.com> 
The scsi_read function incorrectly decrements the block count twice
when handling large disks that trigger the CONFIG_SYS_64BIT_LBA code
path (reads beyond block 268,435,455). The variable 'blks' was being
decremented both inside the 64-bit LBA block and after the successful
scsi_exec() call, causing incorrect block count tracking and data
abort errors on large capacity disks.

Signed-off-by: Balaji Selvanathan <balaji.selvanathan@oss.qualcomm.com>
Tested-by: Tony Dinh <mibodhi@gmail.com>
fix PL330 CMD supported target 2025-12-22T16:03:59+00:00 Brian Sune briansune@gmail.com 2025-12-22T14:27:44+00:00 f26db83ca964e81d7f2b3c2c984afdb8bb104678 The config is wrongly written, result in only support socdk board. Fixes: 92dcb3ad5d98 ("cmd/dma: implement dmareset command") Signed-off-by: Brian Sune <briansune@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com> 
The config is wrongly written, result
in only support socdk board.

Fixes: 92dcb3ad5d98 ("cmd/dma: implement dmareset command")
Signed-off-by: Brian Sune <briansune@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
test/py, buildman: Update filelock package version 2025-12-18T16:28:10+00:00 Tom Rini trini@konsulko.com 2025-12-16T22:19:35+00:00 d24f4ae65433aa7720c075a9f1d1aaf7e1985ced The GitHub dependabot tool has reported a "medium" priority bug CVE-2025-68146, with this package. Update to the patched version. Reported-by: GitHub dependabot Signed-off-by: Tom Rini <trini@konsulko.com> 
The GitHub dependabot tool has reported a "medium" priority bug
CVE-2025-68146, with this package. Update to the patched version.

Reported-by: GitHub dependabot
Signed-off-by: Tom Rini <trini@konsulko.com>
doc: pytest: fix typo in multiple config options example for buildconfigspec 2025-12-18T16:26:35+00:00 Quentin Schulz quentin.schulz@cherry.de 2025-12-17T14:02:27+00:00 24ab2b9684d72af960a7145a88c34ab0ec801c84 The option should be 'net_lwip' and not 'net lwip' (see all usage of it in the test code base). Fixes: 2bac578c5aba ("test: allow multiple config options in buildconfigspec") Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org> 
The option should be 'net_lwip' and not 'net lwip' (see all usage of it
in the test code base).

Fixes: 2bac578c5aba ("test: allow multiple config options in buildconfigspec")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>
cmd: nvedit: Validate argument count before use 2025-12-18T16:26:22+00:00 Marek Vasut marek.vasut+renesas@mailbox.org 2025-12-17T19:57:38+00:00 2333d446b7b133ddfb9dea2d53996d560796ecd9 Avoid NULL pointer dereference in case 'env select' is invoked without parameters, check the arg count and make sure it is at least 2, otherwise print usage. The crash is easy to trigger e.g. in sandbox: $ ./u-boot -Tc "env select" Fixes: a97d22ebba23 ("cmd: env: add env select command") Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> Tested-by: Vincent Stehlé <vincent.stehle@arm.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> 
Avoid NULL pointer dereference in case 'env select' is invoked
without parameters, check the arg count and make sure it is at
least 2, otherwise print usage.

The crash is easy to trigger e.g. in sandbox:
$ ./u-boot -Tc "env select"

Fixes: a97d22ebba23 ("cmd: env: add env select command")
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Tested-by: Vincent Stehlé <vincent.stehle@arm.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
doc: board: ti: fix alt name for tispl.bin in DFU mode 2025-12-18T16:25:44+00:00 Anshul Dalal anshuld@ti.com 2025-12-18T05:01:55+00:00 d865f2f0162b1121f271bd3e6c1e3f171036aec9 The alt name for tispl binary is "tispl.bin" and not "tispl", this patch fixes the documentation to the correct alt name. Fixes: def64b493748 ("doc: board: Add document for DFU boot on am62x SoCs") Fixes: 3633fdbb6b90 ("ti: add support for AM6254atl SiP") Signed-off-by: Anshul Dalal <anshuld@ti.com> Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org> 
The alt name for tispl binary is "tispl.bin" and not "tispl", this patch
fixes the documentation to the correct alt name.

Fixes: def64b493748 ("doc: board: Add document for DFU boot on am62x SoCs")
Fixes: 3633fdbb6b90 ("ti: add support for AM6254atl SiP")

Signed-off-by: Anshul Dalal <anshuld@ti.com>
Reviewed-by: Mattijs Korpershoek <mkorpershoek@kernel.org>
Merge tag 'net-20251218' of https://source.denx.de/u-boot/custodians/u-boot-net 2025-12-18T16:24:39+00:00 Tom Rini trini@konsulko.com 2025-12-18T16:24:39+00:00 8d210fa37f49169c5ad0d46a7bc82aed59f51984 Pull request net-20251218. net-lwip: - Avoid NULL dereference in _set_cacert() - Fix filename handling in TFTP 
Pull request net-20251218.

net-lwip:
- Avoid NULL dereference in _set_cacert()
- Fix filename handling in TFTP
cmd: lwip/wget: avoid NULL dereference in _set_cacert() 2025-12-18T15:27:15+00:00 Heinrich Schuchardt heinrich.schuchardt@canonical.com 2025-12-01T15:17:24+00:00 a8a81af848b88d7ecee64d98a08f6415630305b3 Running `wget cacert builtin` leads to a crash in _set_cacert(): Unhandled exception: Load access fault Function _set_cacert() dereferences variable wget_info. We must initialize it before executing the cacert sub-command. Fixes: d3761a31ef09 ("lwip: split net/lwip/wget.c") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> 
Running `wget cacert builtin` leads to a crash in _set_cacert():

    Unhandled exception: Load access fault

Function _set_cacert() dereferences variable wget_info.
We must initialize it before executing the cacert sub-command.

Fixes: d3761a31ef09 ("lwip: split net/lwip/wget.c")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
net: lwip: tftp: Fix filename handling 2025-12-18T15:27:15+00:00 Andrew Goodbody andrew.goodbody@linaro.org 2025-12-05T17:28:36+00:00 8910efa71b8bab88b0ca81b681b5842fd25b1000 The code to choose the filename to use does not cope with no name set at all. Firstly the test for a name in net_boot_file_name tests the pointer rather than the string it points to. Secondly the cleanup on exit in this case attempts to free a global variable. Fix both issues. Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> 
The code to choose the filename to use does not cope with no name set at
all. Firstly the test for a name in net_boot_file_name tests the pointer
rather than the string it points to. Secondly the cleanup on exit in
this case attempts to free a global variable. Fix both issues.

Signed-off-by: Andrew Goodbody <andrew.goodbody@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>