diff options
| author | Ferass El Hafidi <[email protected]> | 2026-04-22 15:43:23 +0000 |
|---|---|---|
| committer | Neil Armstrong <[email protected]> | 2026-04-22 18:27:26 +0200 |
| commit | 93c13379a4446ea38f85c4e393d187b8de2159ab (patch) | |
| tree | a7b15bd21a1bacb44e99d863906ab86d3eafa8fb | |
| parent | 723f14c946cbc8c09c3acf7bb7b7da65a4eeecd0 (diff) | |
arm: mach-meson: provide reset_cpu only when SYSRESET is disabled
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 <[email protected]>
Reviewed-by: Neil Armstrong <[email protected]>
Link: https://patch.msgid.link/20260422-b4-amlogic-sysreset-capsules-v3-1-07b5ccc8f552@postmarketos.org
Signed-off-by: Neil Armstrong <[email protected]>
| -rw-r--r-- | arch/arm/mach-meson/board-common.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index a5afc2d75c0..c34b81e5e78 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -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 |