[U-Boot] [PATCH] arm: socfpga: disable CONFIG_SPL_WDT for gen5 and a10

[Marek Vasut]

On 10/5/19 10:10 PM, Simon Goldschmidt wrote:
> These boards don't have a watchdog enabled in SPL, so make sure
> CONFIG_SPL_WDT is not enabled.
> 
> Fixes: commit 6874cb72204f ("watchdog: Split WDT from SPL_WDT")
> ---
> 
> 
> While I think the more fundamental problem is selecting
> SPL_WATCHDOG_SUPPORT in arch/arm/Kconfig, let's fix it this way
> for the upcoming v2019.10 release to prevent breaking s10.
> 

Indeed, we need some sort of bandaid for my flub.

[...]

> diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig
> index a2d555b9b4..7cb214d655 100644
> --- a/configs/socfpga_arria10_defconfig
> +++ b/configs/socfpga_arria10_defconfig
> @@ -46,3 +46,4 @@ CONFIG_SPI=y
>  CONFIG_TIMER=y
>  CONFIG_SPL_TIMER=y
>  CONFIG_DESIGNWARE_APB_TIMER=y
> +# CONFIG_SPL_WDT is not set

[...]

> diff --git a/configs/socfpga_vining_fpga_defconfig b/configs/socfpga_vining_fpga_defconfig
> index 6b2266fdfd..c52afddd20 100644
> --- a/configs/socfpga_vining_fpga_defconfig
> +++ b/configs/socfpga_vining_fpga_defconfig
> @@ -91,3 +91,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
>  CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
>  CONFIG_USB_GADGET_DWC2_OTG=y
>  CONFIG_USB_GADGET_DOWNLOAD=y
> +# CONFIG_SPL_WDT is not set

I think these two boards enabled WDT in SPL, no ?