pá 25. 10. 2024 v 13:56 odesílatel Michal Simek <[email protected]> napsal: > > 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 <[email protected]> > --- > > 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 39474674cca2..27c1cfc6558a 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.43.0 >
Applied. M -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs
