On Thu, Oct 3, 2019 at 9:00 PM Marek Vasut <ma...@denx.de> 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. > > Signed-off-by: Marek Vasut <ma...@denx.de> > Cc: Chin Liang See <chin.liang....@intel.com> > Cc: Dalon Westergreen <dwest...@gmail.com> > Cc: Dinh Nguyen <dingu...@kernel.org> > Cc: Jagan Teki <ja...@amarulasolutions.com> > Cc: Ley Foon Tan <ley.foon....@intel.com> > Cc: Philipp Tomisch <philipp.tomi...@theobroma-systems.com> > Cc: Simon Goldschmidt <simon.k.r.goldschm...@gmail.com> > Cc: Tien Fong Chee <tien.fong.c...@intel.com> > --- > 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. Regards Ley Foon > drivers/watchdog/Kconfig | 7 +++++++ > include/configs/socfpga_common.h | 3 --- > include/configs/socfpga_stratix10_socdk.h | 6 ++++-- > scripts/config_whitelist.txt | 1 - > 6 files changed, 13 insertions(+), 6 deletions(-) > > diff --git a/configs/socfpga_stratix10_defconfig > b/configs/socfpga_stratix10_defconfig > index ad83f50032..462082b67b 100644 > --- a/configs/socfpga_stratix10_defconfig > +++ b/configs/socfpga_stratix10_defconfig CONFIG_DESIGNWARE_WATCHDOG > @@ -56,3 +56,4 @@ CONFIG_USB=y > CONFIG_DM_USB=y > CONFIG_USB_DWC2=y > CONFIG_USB_STORAGE=y > +CONFIG_DESIGNWARE_WATCHDOG=y > diff --git a/configs/socfpga_vining_fpga_defconfig > b/configs/socfpga_vining_fpga_defconfig > index 96f806ab5f..03c43fa8b9 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_DESIGNWARE_WATCHDOG=y > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index a66a9bcbe2..6fd9b0a177 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -36,6 +36,13 @@ config ULP_WATCHDOG > help > Say Y here to enable i.MX7ULP watchdog driver. > > +config DESIGNWARE_WATCHDOG > + bool "Designware watchdog timer support" > + select HW_WATCHDOG > + help > + Enable this to support Designware Watchdog Timer IP, present e.g. > + on Altera SoCFPGA SoCs. > + > config WDT > bool "Enable driver model for watchdog timer drivers" > depends on DM > 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 > > /* > * MMC Driver > diff --git a/include/configs/socfpga_stratix10_socdk.h > b/include/configs/socfpga_stratix10_socdk.h > index 7b55dd14da..353e08f982 100644 > --- a/include/configs/socfpga_stratix10_socdk.h > +++ b/include/configs/socfpga_stratix10_socdk.h > @@ -162,14 +162,16 @@ unsigned int cm_get_qspi_controller_clk_hz(void); > */ > #ifdef CONFIG_SPL_BUILD > #define CONFIG_HW_WATCHDOG > -#define CONFIG_DESIGNWARE_WATCHDOG > +#else > +#undef CONFIG_HW_WATCHDOG > +#undef CONFIG_DESIGNWARE_WATCHDOG > +#endif > #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS > #ifndef __ASSEMBLY__ > unsigned int cm_get_l4_sys_free_clk_hz(void); > #define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() > / 1000) > #endif > #define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000 > -#endif > > /* > * SPL memory layout > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index b18eab1707..839eda8c0f 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -320,7 +320,6 @@ CONFIG_DEFAULT_IMMR > CONFIG_DEF_HWCONFIG > CONFIG_DELAY_ENVIRONMENT > CONFIG_DESIGNWARE_ETH > -CONFIG_DESIGNWARE_WATCHDOG > CONFIG_DEVELOP > CONFIG_DEVICE_TREE_LIST > CONFIG_DFU_ALT > -- > 2.23.0 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot