[PATCH 1/5] ARM: imx: Do not define do_reset() if sysreset is enabled

[Harald Seiler]

Hello Marek,

On Tue, 2020-04-28 at 16:22 +0200, Marek Vasut wrote:
> The SPL can also be compiled with sysreset drivers just fine, so
> update the condition to cater for that option.

Me and Claudius solved the same problem in a different way a while back
(see [1] and [2]).

The two approaches overlap but both contain some unique code that is
useful.  I'll merge the two patchsets and send them anew if that is ok
with you.

[1]: https://lists.denx.de/pipermail/u-boot/2020-March/401935.html
[2]: https://patchwork.ozlabs.org/project/uboot/list/?series=162379

> Signed-off-by: Marek Vasut <marex at denx.de>
> Cc: Fabio Estevam <festevam at gmail.com>
> Cc: Flavio Suligoi <f.suligoi at asem.it>
> Cc: Harald Seiler <hws at denx.de>
> Cc: Igor Opaniuk <igor.opaniuk at toradex.com>
> Cc: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> Cc: Oleksandr Suvorov <oleksandr.suvorov at toradex.com>
> Cc: Peng Fan <peng.fan at nxp.com>
> Cc: Stefano Babic <sbabic at denx.de>
> ---
>  arch/arm/mach-imx/imx8m/soc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
> index 7fcbd53f30..0f17252e80 100644
> --- a/arch/arm/mach-imx/imx8m/soc.c
> +++ b/arch/arm/mach-imx/imx8m/soc.c
> @@ -382,7 +382,7 @@ int ft_system_setup(void *blob, bd_t *bd)
>  }
>  #endif
>  
> -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYSRESET)
> +#if !CONFIG_IS_ENABLED(SYSRESET)
>  void reset_cpu(ulong addr)
>  {
>         struct watchdog_regs *wdog = (struct watchdog_regs *)addr;
-- 
Harald

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-62  Fax: +49-8142-66989-80   Email: hws at denx.de