On Thu, Apr 10, 2025 at 05:32:06PM +0530, Varadarajan Narayanan wrote:
> If CONFIG_SYSRESET is enabled, the reset_cpu() function defined in
> arch/arm/mach-snapdragon/board.c conflicts with the definition of
> reset_cpu() in drivers/sysreset/sysreset-uclass.c resulting in duplicate
> symbol error while compiling. So, do not include it if CONFIG_SYSRESET
> is enabled.
I would rather like to see all Qcom platforms migrating to SYSRESET but
this looks reasonable to me as of now, FWIW:
Reviewed-by: Sumit Garg <sumit.g...@oss.qualcomm.com>
-Sumit
>
> Signed-off-by: Varadarajan Narayanan <quic_var...@quicinc.com>
> ---
> arch/arm/mach-snapdragon/board.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-snapdragon/board.c
> b/arch/arm/mach-snapdragon/board.c
> index 2ef936aab75..2254e0b55a1 100644
> --- a/arch/arm/mach-snapdragon/board.c
> +++ b/arch/arm/mach-snapdragon/board.c
> @@ -187,10 +187,12 @@ int board_fdt_blob_setup(void **fdtp)
> return ret;
> }
>
> +#if !IS_ENABLED(CONFIG_SYSRESET)
> void reset_cpu(void)
> {
> psci_system_reset();
> }
> +#endif
>
> /*
> * Some Qualcomm boards require GPIO configuration when switching USB modes.
> --
> 2.34.1
>
