mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-04 20:26:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm: mach-meson: provide reset_cpu only when SYSRESET is disabled

Browse Source 
This is in preparation of enabling SYSRESET across all Amlogic boards by
default. SYSRESET brings its own reset_cpu implementation which will
conflict with the one defined in board-common.c.
SPL however will not have SYSRESET enabled (due to overhead in the final
image, as we have very little space to work with), and thus will still
need that reset_cpu to be defined. Furthermore, some boards do not enable
PSCI support in U-Boot, so they may still need this implementation.
Guard reset_cpu inside #ifdef to only compile it in when SYSRESET is not
enabled.

Signed-off-by: Ferass El Hafidi <funderscore@postmarketos.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patch.msgid.link/20260422-b4-amlogic-sysreset-capsules-v3-1-07b5ccc8f552@postmarketos.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
This commit is contained in:
Ferass El Hafidi 2026-04-22 15:43:23 +00:00 committed by Neil Armstrong
parent 723f14c946
commit 93c13379a4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-meson/board-common.c
View File

@ -155,16 +155,14 @@ int board_late_init(void)
return meson_board_late_init();
}
#if defined(CONFIG_XPL) || !CONFIG_IS_ENABLED(SYSRESET)
void reset_cpu(void)
{
#if CONFIG_SPL_BUILD
/*
* We do not have BL31 running yet, so no PSCI.
* Instead, let the watchdog reset the board.
*/
for (;;)
;
#else
psci_system_reset();
#endif
}
#endif