[U-Boot] [PATCH v2 4/4] Convert CONFIG_HW_WATCHDOG to Kconfig

[Heiko Schocher]

Hello Lukasz,

Am 09.02.2018 um 23:14 schrieb Lukasz Majewski:
> The CONFIG_HW_WATCHDOG declaration has been converted to Kconfig
> 
> Signed-off-by: Lukasz Majewski <lukma at denx.de>
> 
> ---
> 
> Changes in v2:
> - None
> 
>   configs/axm_defconfig                | 1 +
>   configs/calimain_defconfig           | 1 +
>   configs/microblaze-generic_defconfig | 1 +
>   configs/nokia_rx51_defconfig         | 1 +
>   configs/picosam9g45_defconfig        | 1 +
>   configs/smartweb_defconfig           | 1 +
>   configs/taurus_defconfig             | 1 +
>   configs/ts4800_defconfig             | 1 +
>   include/configs/M5475EVB.h           | 1 -
>   include/configs/M5485EVB.h           | 1 -
>   include/configs/calimain.h           | 1 -
>   include/configs/controlcenterd.h     | 1 -
>   include/configs/eb_cpu5282.h         | 2 --
>   include/configs/microblaze-generic.h | 1 -
>   include/configs/nokia_rx51.h         | 1 -
>   include/configs/picosam9g45.h        | 1 -
>   include/configs/smartweb.h           | 3 ---
>   include/configs/taurus.h             | 1 -
>   include/configs/ts4800.h             | 2 --
>   19 files changed, 8 insertions(+), 15 deletions(-)

[...]
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 16481cb7ce..254558045c 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -50,7 +50,6 @@
>   # define CONFIG_WATCHDOG_BASEADDR	XILINX_WATCHDOG_BASEADDR
>   # define CONFIG_WATCHDOG_IRQ		XILINX_WATCHDOG_IRQ
>   # ifndef CONFIG_SPL_BUILD
> -#  define CONFIG_HW_WATCHDOG
>   #  define CONFIG_XILINX_TB_WATCHDOG
>   # endif
>   #endif

Hmm... does this mean now, that HW_WATCHDOG is also in SPL
enabled for microblaze?

Did you checked that the resulting images (if you do a reproducible
build with SOURCE_DATE_EPOCH set) are the same?

IIRC, I prepared a tbot testcase to check exatly this ... let me
search ... ah, yes:

https://github.com/hsdenx/tbot/blob/master/src/tc/uboot/tc_uboot_check_kconfig.py

> diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
> index 49c838bf72..5bbf4c28f6 100644
> --- a/include/configs/smartweb.h
> +++ b/include/configs/smartweb.h
> @@ -125,9 +125,6 @@
>   
>   /* Enable the watchdog */
>   #define CONFIG_AT91SAM9_WATCHDOG
> -#if !defined(CONFIG_SPL_BUILD)
> -#define CONFIG_HW_WATCHDOG
> -#endif
>   #define CONFIG_AT91_HW_WDT_TIMEOUT	15

Huch ... here too ... the smartweb board has extremly low
sram, and now we have WDT enabled in SPL ...

>   #if !defined(CONFIG_SPL_BUILD)
> diff --git a/include/configs/taurus.h b/include/configs/taurus.h
> index ce06f7bb5f..04d8e8d433 100644
> --- a/include/configs/taurus.h
> +++ b/include/configs/taurus.h
> @@ -94,7 +94,6 @@
>   #define CONFIG_AT91_HW_WDT_TIMEOUT	15
>   #if !defined(CONFIG_SPL_BUILD)
>   /* Enable the watchdog */
> -#define CONFIG_HW_WATCHDOG
>   #endif

and here ...

I tried to apply your patchset to current mainline, I get this error
for this patch:

pollux:u-boot-smartweb hs [master] $ git am mbox
Wende an: Convert CONFIG_HW_WATCHDOG to Kconfig
error: Anwendung des Patches fehlgeschlagen: include/configs/calimain.h:29
error: include/configs/calimain.h: Patch konnte nicht angewendet werden

Please rebase this patch. Nevertheless I fixed it fast locally and tried
your patches with tbot on the smartweb board, all worked fine, no
size problems!

Uh ... no ... board is now resetting all 15 seconds if no input over
console!

reverted this patcheset, and resets are gone ... hmm... I cannot see
how your patches produce this behaviour ... May I find time to look
here closer, but I have to leave now ...

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