[U-Boot] [PATCH V2 1/3] watchdog: designware: Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig

[Ley Foon Tan]

On Thu, Oct 10, 2019 at 3:47 PM Marek Vasut <marex at denx.de> wrote:
>
> On 10/10/19 8:28 AM, Ley Foon Tan wrote:
> > On Fri, Oct 4, 2019 at 7:04 PM Marek Vasut wrote:
> >>
> >> On 10/4/19 10:59 AM, Ley Foon Tan wrote:
> >>> On Thu, Oct 3, 2019 at 9:00 PM Marek Vasut wrote:
> >>>>
> >>>> Migrate CONFIG_DESIGNWARE_WATCHDOG to Kconfig and update the headers
> >>>> accordingly, no functional change. The S10 enables the WDT only in
> >>>> SPL, but does not enable it in U-Boot itself, hence disable it in
> >>>> the config again.
> >>>> ---
> >>>> V2: Use non-DM watchdog in SPL on S10
> >>>> ---
> >>>>  configs/socfpga_stratix10_defconfig       | 1 +
> >>>>  configs/socfpga_vining_fpga_defconfig     | 1 +
> >>>
> >>> All socfpga deconfig files need to add CONFIG_DESIGNWARE_WATCHDOG too.
> >>> socfpga_common.h is used by Gen5 and A10 platform.
> >>
> >> Only those which defined CONFIG_HW_WATCHDOG need to enable the
> >> CONFIG_DESIGNWARE_WATCHDOG, right ? (see below)
> >
> > $ git grep socfpga_common.h
> > include/configs/socfpga_arria10_socdk.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_arria5_socdk.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_cyclone5_socdk.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_dbm_soc1.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_de0_nano_soc.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_de10_nano.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_de1_soc.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_is1.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_mcvevk.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_sockit.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_socrates.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_sr1500.h:#include <configs/socfpga_common.h>
> > include/configs/socfpga_vining_fpga.h:#include <configs/socfpga_common.h>
> >
> > These platforms include socfpga_common.h file, so their _defconfig
> > need to update too.
>
> They don't enable HW_WATCHDOG, so it doesn't ... or ?
Sorry, I see wrongly. I thought HW_WATCHDOG is defined in socfpga_common.h.
Then no problem now.

Regards
Ley Foon
>
> >> [...]
> >>
> >>>> diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> >>>> index b11fe021a7..32b9131be0 100644
> >>>> --- a/include/configs/socfpga_common.h
> >>>> +++ b/include/configs/socfpga_common.h
> >>>> @@ -104,12 +104,9 @@
> >>>>  /*
> >>>>   * L4 Watchdog
> >>>>   */
> >>>> -#ifdef CONFIG_HW_WATCHDOG
> >>>> -#define CONFIG_DESIGNWARE_WATCHDOG
> >>>>  #define CONFIG_DW_WDT_BASE             SOCFPGA_L4WD0_ADDRESS
> >>>>  #define CONFIG_DW_WDT_CLOCK_KHZ                25000
> >>>>  #define CONFIG_WATCHDOG_TIMEOUT_MSECS  30000
> >>>> -#endif
> >>
> >> [...]
>
>
> --
> Best regards,
> Marek Vasut