diff options
| author | Tom Rini <[email protected]> | 2026-04-27 08:04:06 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-04-27 08:04:06 -0600 |
| commit | ee35366a6405fb4bbdfdd839cd7a17a4079be78f (patch) | |
| tree | 759be5d98589a35172ff681fd4cf34dd4f47b664 /arch | |
| parent | 9271f908b4eea4fa127c2ec0d910e71b05ac2d64 (diff) | |
| parent | e07cc9e7fdcc35780f539ee1d452ffd3da0fbd1f (diff) | |
Merge tag 'u-boot-amlogic-next-20260427' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- enable EFI Capsule on Disk (+ sysreset fixup/cleanup)
- do not fail when setting SD_EMMC_x_CLK0 on GX/G12
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-meson/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-meson/board-common.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index ef86129b535..c687ef822a2 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -12,6 +12,8 @@ config MESON64_COMMON select MMC_PWRSEQ select BOARD_LATE_INIT select MESON_SM + imply SYSRESET + imply SYSRESET_PSCI imply CMD_DM config MESON_GX 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 |