[U-Boot] [PATCH 06/13 v3] arm: at91: Remove CONFIG_AT91_HW_WDT_TIMEOUT

Eugen.Hristev at microchip.com Eugen.Hristev at microchip.com
Tue Apr 2 11:19:42 UTC 2019



On 02.04.2019 11:57, Stefan Roese wrote:
> External E-Mail
> 
> 
> This patch removes the CONFIG_AT91_HW_WDT_TIMEOUT as its not needed any
> more. The WD timeout value can be provided via the "timeout-sec" DT
> property. If not provided this way, the default value of 2 seconds will
> be used.
> 
> Signed-off-by: Stefan Roese <sr at denx.de>
> Cc: Heiko Schocher <hs at denx.de>
> Cc: Andreas BieƟmann <andreas at biessmann.org>
> Cc: Eugen Hristev <eugen.hristev at microchip.com>
> ---
> v3:
> - New patch
> 
>   README                          | 3 ---
>   configs/smartweb_defconfig      | 1 -
>   configs/taurus_defconfig        | 1 -
>   drivers/watchdog/Kconfig        | 4 ----
>   drivers/watchdog/at91sam9_wdt.c | 2 --
>   5 files changed, 11 deletions(-)
> 
> diff --git a/README b/README
> index c9a20db34f..a514f48cae 100644
> --- a/README
> +++ b/README
> @@ -767,9 +767,6 @@ The following options need to be configured:
>   		SoC, then define this variable and provide board
>   		specific code for the "hw_watchdog_reset" function.
>   
> -		CONFIG_AT91_HW_WDT_TIMEOUT
> -		specify the timeout in seconds. default 2 seconds.
> -
>   - Real-Time Clock:
>   
>   		When CONFIG_CMD_DATE is selected, the type of the RTC
> diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
> index 7c7220afc8..807a569121 100644
> --- a/configs/smartweb_defconfig
> +++ b/configs/smartweb_defconfig
> @@ -59,6 +59,5 @@ CONFIG_USB_ETHER_ASIX=y
>   CONFIG_USB_ETHER_MCS7830=y
>   CONFIG_WDT=y
>   CONFIG_WDT_AT91=y
> -CONFIG_AT91_HW_WDT_TIMEOUT=y
>   CONFIG_SPL_TINY_MEMSET=y
>   # CONFIG_EFI_LOADER is not set
> diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
> index 022b0b6da1..d69f4895ef 100644
> --- a/configs/taurus_defconfig
> +++ b/configs/taurus_defconfig
> @@ -62,5 +62,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2
>   CONFIG_USB_GADGET_DOWNLOAD=y
>   CONFIG_WDT=y
>   CONFIG_WDT_AT91=y
> -CONFIG_AT91_HW_WDT_TIMEOUT=y
>   CONFIG_USE_TINY_PRINTF=y
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 115fc4551f..34e78beb2a 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -139,10 +139,6 @@ config WDT_AT91
>   	   Select this to enable Microchip watchdog timer, which can be found on
>   	   some AT91 devices.
>   
> -config AT91_HW_WDT_TIMEOUT
> -	bool "AT91 watchdog timeout specified"
> -	depends on WDT_AT91
> -
>   config WDT_MT7621
>   	bool "MediaTek MT7621 watchdog timer support"
>   	depends on WDT && ARCH_MT7620
> diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
> index b0a3b4ed58..1c71778bdc 100644
> --- a/drivers/watchdog/at91sam9_wdt.c
> +++ b/drivers/watchdog/at91sam9_wdt.c
> @@ -117,11 +117,9 @@ static int at91_wdt_probe(struct udevice *dev)
>   	if (!priv->regs)
>   		return -EINVAL;
>   
> -#ifdef CONFIG_AT91_HW_WDT_TIMEOUT
>   	priv->timeout = dev_read_u32_default(dev, "timeout-sec",
>   					     WDT_DEFAULT_TIMEOUT);
>   	debug("%s: timeout %d", __func__, priv->timeout);
> -#endif
>   
>   	debug("%s: Probing wdt%u\n", __func__, dev->seq);
>   
> 

Hi Stefan,

This breaks picosam9g45_defconfig

include/dm/read.h:535: undefined reference to `ofnode_read_u32_default'
arm-linux-gnueabihf-ld.bfd: BFD (Linaro_Binutils-2018.05) 
2.28.2.20170706 assertion fail 
/home/tcwg-buildslave/workspace/tcwg-make-release/builder_arch/amd64/label/tcwg-x86_64-build/target/arm-linux-gnueabihf/snapshots/binutils-gdb.git~users~linaro~binutils-2_28-branch/bfd/elf32-arm.c:9514
Makefile:1497: recipe for target 'u-boot' failed

gcc version 7.3.1 20180425 [linaro-7.3-2018.05 revision 
d29120a424ecfbc167ef90065c0eeb7f91977701] (Linaro GCC 7.3-2018.05)



More information about the U-Boot mailing list