[U-Boot] [PATCH] at91: Don't initialize watchdog if CONFIG_SYS_WDTC_WDMR_VAL is undefined

Wolfgang Denk wd at denx.de
Wed Jul 21 20:20:48 CEST 2010


Dear Alexander Stein,

In message <1279713664-20353-1-git-send-email-alexander.stein at systec-electronic.com> you wrote:
> This allows Linux to initialize and use the watchdog with the included
> driver.
> CONFIG_AT91SAM9_WATCHDOG and CONFIG_HW_WATCHDOG should be defined to make
> u-boot trigger the watchdog
> 
> Signed-off-by: Alexander Stein <alexander.stein at systec-electronic.com>
> ---
>  arch/arm/cpu/arm926ejs/at91/lowlevel_init.S |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
> index 559c35c..21ebae9 100644
> --- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
> +++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
> @@ -186,8 +186,10 @@ SDRAM_setup_end:
>  	.ltorg
>  
>  SMRDATA:
> +#if defined(CONFIG_SYS_WDTC_WDMR_VAL)
>  	.word AT91_ASM_WDT_MR
>  	.word CONFIG_SYS_WDTC_WDMR_VAL
> +#endif

This seems the wrong approach to me - when CONFIG_HW_WATCHDOG is
defined and requires CONFIG_SYS_WDTC_WDMR_VAL, but the latter is
missing, than this should raise n error condition. We must not
silently ignore errors.

NAK.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"The POP3 server service depends on the SMTP  server  service,  which
failed to start because of the following error: The operation comple-
ted successfully."                         -- Windows NT Server v3.51


More information about the U-Boot mailing list