u-boot.git, branch v2025.04-rc2 Unnamed repository; edit this file 'description' to name the repository. Prepare v2025.04-rc2 2025-02-10T22:00:49+00:00 Tom Rini trini@konsulko.com 2025-02-10T22:00:49+00:00 636fcc96c3d7e2b00c843e6da78ed3e9e3bdf4de Signed-off-by: Tom Rini <trini@konsulko.com> 
Signed-off-by: Tom Rini <trini@konsulko.com>
CI: Drop extra condition for sjg lab 2025-02-10T19:54:55+00:00 Simon Glass sjg@chromium.org 2024-12-01T14:42:29+00:00 cb3612dfe3fd9a702dc3657aae15b07974f9aa0b The rules part of the template makes sure that this doesn't run until specifically requested. Drop the check in the script itself, so it is possible to trigger a run manually without re-pushing the tree. Signed-off-by: Simon Glass <sjg@chromium.org> 
The rules part of the template makes sure that this doesn't run until
specifically requested. Drop the check in the script itself, so it is
possible to trigger a run manually without re-pushing the tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
Merge patch series "Enable MCU ESM reset" 2025-02-10T16:32:03+00:00 Tom Rini trini@konsulko.com 2025-02-10T16:32:03+00:00 ac5d05f0700e719c20feb1f3d96e2a5e7d3e46bd Judith Mendez <jm@ti.com> says: This patch series enables ESM reset configuration in board_init_f for am62x and am62px devices. This is necessary in order for error events to reset the system. This patches are tested using watchdog to reset the system via ESM. Link: https://lore.kernel.org/r/20250129234403.574766-1-jm@ti.com 
Judith Mendez <jm@ti.com> says:

This patch series enables ESM reset configuration in board_init_f
for am62x and am62px devices.

This is necessary in order for error events to reset the system.

This patches are tested using watchdog to reset the system via ESM.

Link: https://lore.kernel.org/r/20250129234403.574766-1-jm@ti.com
configs: am62*_evm_r5: Enable ESM and MISC configs 2025-02-10T16:30:41+00:00 Santhosh Kumar K s-k6@ti.com 2025-01-29T23:44:03+00:00 dd7d2042d5a1b4f8c6b29b71177a41ca1428c43f Enable CONFIG_SPL_DRIVERS_MISC, CONFIG_SPL_MISC, CONFIG_ESM_K3 to probe the Main ESM and MCU ESM nodes. Signed-off-by: Santhosh Kumar K <s-k6@ti.com> Signed-off-by: Judith Mendez <jm@ti.com> 
Enable CONFIG_SPL_DRIVERS_MISC, CONFIG_SPL_MISC, CONFIG_ESM_K3
to probe the Main ESM and MCU ESM nodes.

Signed-off-by: Santhosh Kumar K <s-k6@ti.com>
Signed-off-by: Judith Mendez <jm@ti.com>
arm: mach-k3: am62*_init: Probe ESM nodes 2025-02-10T16:30:41+00:00 Santhosh Kumar K s-k6@ti.com 2025-01-29T23:44:02+00:00 630fe2f88a74f99154fe009b84d57a01279c5274 On AM62A and AM62P devices, it is possible to route Main ESM error events to MCU ESM. MCU ESM high error output can trigger the reset logic to reset the device. So, for these devices we have Main ESM and MCU ESM nodes in the device tree. Add functions to probe these nodes if CONFIG_ESM_K3 is enabled. Signed-off-by: Santhosh Kumar K <s-k6@ti.com> Signed-off-by: Judith Mendez <jm@ti.com> 
On AM62A and AM62P devices, it is possible to route Main ESM error
events to MCU ESM. MCU ESM high error output can trigger the reset
logic to reset the device. So, for these devices we have Main ESM and
MCU ESM nodes in the device tree. Add functions to probe these nodes
if CONFIG_ESM_K3 is enabled.

Signed-off-by: Santhosh Kumar K <s-k6@ti.com>
Signed-off-by: Judith Mendez <jm@ti.com>
include: env: phytec: Add optargs to K3 files 2025-02-10T16:30:15+00:00 Nathan Morrisson nmorrisson@phytec.com 2025-01-29T10:34:44+00:00 27d0af5e857706b5b7bfed5b43ac3ed418a4e56f Add the optargs variable so that we can set optional arguments while booting. Signed-off-by: Nathan Morrisson <nmorrisson@phytec.com> Signed-off-by: Daniel Schultz <d.schultz@phytec.de> 
Add the optargs variable so that we can set optional arguments while
booting.

Signed-off-by: Nathan Morrisson <nmorrisson@phytec.com>
Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
env: fat: Avoid writing to read-only location 2025-02-10T16:29:53+00:00 Andre Przywara andre.przywara@arm.com 2025-01-30T13:36:46+00:00 4ef949eedc2d7bb136ac7a33fb7a072c439e2171 The env_fat_get_dev_part() function mostly returns a fixed string, set via some Kconfig variable. However when the first character is a colon, that means that the boot device number is determined at runtime, and patched in. This requires altering the string. So far this was done via some ugly and actually illegal direct write to the .rodata string storage. We got away with this because U-Boot maps everything as read/write/execute so far. A proposed patch set actually enforces read-only (and no-execute) permissions in the page tables, so this routine now causes an exception: ======================= Loading Environment from FAT... "Synchronous Abort" handler, esr 0x9600004f, far 0xfffb7d4c elr: 000000004a054228 lr : 000000004a05421c (reloc) elr: 00000000fff7c228 lr : 00000000fff7c21c ..... ======================= Rewrite the routine to do away with the dodgy string manipulation, instead allocate the string in the r/w .data section, where we can safely manipulate it. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> 
The env_fat_get_dev_part() function mostly returns a fixed string, set
via some Kconfig variable. However when the first character is a colon,
that means that the boot device number is determined at runtime, and
patched in. This requires altering the string.

So far this was done via some ugly and actually illegal direct write to
the .rodata string storage. We got away with this because U-Boot maps
everything as read/write/execute so far.

A proposed patch set actually enforces read-only (and no-execute)
permissions in the page tables, so this routine now causes an exception:
=======================
Loading Environment from FAT... "Synchronous Abort" handler, esr 0x9600004f, far 0xfffb7d4c
elr: 000000004a054228 lr : 000000004a05421c (reloc)
elr: 00000000fff7c228 lr : 00000000fff7c21c
.....
=======================

Rewrite the routine to do away with the dodgy string manipulation,
instead allocate the string in the r/w .data section, where we can
safely manipulate it.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Merge patch series "FIX: Re-enable MUX_MMIO on J721E/J7200" 2025-02-10T16:29:36+00:00 Tom Rini trini@konsulko.com 2025-02-10T16:29:36+00:00 530fc5c9e5670be62b3183cd54b42e5169d19fdf Siddharth Vadapalli <s-vadapalli@ti.com> says: Hello, This series re-enables MUX_MMIO at U-Boot proper on J721E and J7200 SoCs. The commits which introduced support for Hyperflash boot on both of these SoCs disabled MUX_MMIO functionality at U-Boot proper, thereby introducing a regression. Series is based on commit 2b1c8d3b2d cmd: Fix Kconfig coding style of the master branch of U-Boot. Link: https://lore.kernel.org/r/20250201091809.1894892-1-s-vadapalli@ti.com 
Siddharth Vadapalli <s-vadapalli@ti.com> says:

Hello,

This series re-enables MUX_MMIO at U-Boot proper on J721E and J7200
SoCs. The commits which introduced support for Hyperflash boot on both
of these SoCs disabled MUX_MMIO functionality at U-Boot proper, thereby
introducing a regression.

Series is based on commit
2b1c8d3b2d cmd: Fix Kconfig coding style
of the master branch of U-Boot.

Link: https://lore.kernel.org/r/20250201091809.1894892-1-s-vadapalli@ti.com
configs: j7200_evm_a72_defconfig: Re-enable MUX_MMIO at U-Boot proper 2025-02-10T16:29:18+00:00 Siddharth Vadapalli s-vadapalli@ti.com 2025-02-01T09:18:00+00:00 d700d04dd29789a4fe81471fb2b0724c42702d35 Commit under Fixes introduced support for Hyperflash boot but also disabled MUX_MMIO support at U-Boot proper. MUX_MMIO is required at U-Boot proper to setup the SERDES Lane Mapping as described by the device-tree. On J7200 SoC, PCIe functionality is broken since commit under fixes. Fix this regression by re-enabling MUX_MMIO. Fixes: 038f6faea9f0 ("configs: j7200_evm_*_defconfig: Add configs for Hyperflash boot") Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> Reviewed-by: Anurag Dutta <a-dutta@ti.com> 
Commit under Fixes introduced support for Hyperflash boot but also disabled
MUX_MMIO support at U-Boot proper. MUX_MMIO is required at U-Boot proper
to setup the SERDES Lane Mapping as described by the device-tree. On J7200
SoC, PCIe functionality is broken since commit under fixes.

Fix this regression by re-enabling MUX_MMIO.

Fixes: 038f6faea9f0 ("configs: j7200_evm_*_defconfig: Add configs for Hyperflash boot")
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Reviewed-by: Anurag Dutta <a-dutta@ti.com>
configs: j721e_evm_a72_defconfig: Re-enable MUX_MMIO at U-Boot proper 2025-02-10T16:29:18+00:00 Siddharth Vadapalli s-vadapalli@ti.com 2025-02-01T09:17:59+00:00 29b66b008e4b0207d06b4f0efa721d137067b4e8 Commit under Fixes introduced support for Hyperflash boot but also disabled MUX_MMIO support at U-Boot proper. MUX_MMIO is required at U-Boot proper to setup the SERDES Lane Mapping as described by the device-tree. Fix this regression by re-enabling MUX_MMIO. Fixes: fd7fcd4098d5 ("configs: j721e_evm_*_defconfig: Add configs for Hyperflash boot") Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> 
Commit under Fixes introduced support for Hyperflash boot but also disabled
MUX_MMIO support at U-Boot proper. MUX_MMIO is required at U-Boot proper
to setup the SERDES Lane Mapping as described by the device-tree.

Fix this regression by re-enabling MUX_MMIO.

Fixes: fd7fcd4098d5 ("configs: j721e_evm_*_defconfig: Add configs for Hyperflash boot")
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>