From cf3aa7b52ccfbd38540464507fbe17925b9ed3ff Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 25 Oct 2024 13:56:07 +0200 Subject: [PATCH] arm64: versal: Do not define do_reset() if sysreset is enabled If sysreset is enabled reset_cpu is defined in sysreset uclass that's why it can't be in platform/board code. The same change was done by commit f1bc214b0024 ("arm64: zynqmp: Do not define do_reset() if sysreset is enabled"). Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/8c1a5d6148c5e6c46790b725e8148a4e12d393ba.1729857366.git.michal.simek@amd.com --- board/xilinx/versal/board.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 39474674cc..27c1cfc655 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -301,9 +301,11 @@ int dram_init(void) return 0; } +#if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(void) { } +#endif #if defined(CONFIG_ENV_IS_NOWHERE) enum env_location env_get_location(enum env_operation op, int prio) -- 2.39.5