Message ID | 1518791643-31728-3-git-send-email-vipulk@xilinx.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
Series | microblaze: Moved U-boot headers to Kconfig | expand |
On 16.2.2018 15:34, Vipul Kumar wrote: > This patch added Kconfig support for CONFIG_XILINX_TB_WATCHDOG > and enabled it in respective defconfig. > > Signed-off-by: Vipul Kumar <vipulk@xilinx.com> > Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> > --- > configs/microblaze-generic_defconfig | 1 + > drivers/watchdog/Kconfig | 6 ++++++ > include/configs/microblaze-generic.h | 1 - > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig > index e707b9f..47d4204 100644 > --- a/configs/microblaze-generic_defconfig > +++ b/configs/microblaze-generic_defconfig > @@ -59,3 +59,4 @@ CONFIG_XILINX_AXIEMAC=y > CONFIG_XILINX_EMACLITE=y > CONFIG_SYS_NS16550=y > CONFIG_XILINX_UARTLITE=y > +CONFIG_XILINX_TB_WATCHDOG=y > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index fc46b67..bd209fa 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -78,4 +78,10 @@ config WDT_ORION > Select this to enable Orion watchdog timer, which can be found on some > Marvell Armada chips. > > +config XILINX_TB_WATCHDOG > + bool "Xilinx watchdog timer support" > + depends on MICROBLAZE && !SPL_BUILD You should also add there select HW_WATCHDOG. Thanks, Michal > + help > + Available for Xilinx Axi platforms to service timebase watchdog timer. > + > endmenu > diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h > index de33583..a4d911d 100644 > --- a/include/configs/microblaze-generic.h > +++ b/include/configs/microblaze-generic.h > @@ -50,7 +50,6 @@ > # define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ > # ifndef CONFIG_SPL_BUILD > # define CONFIG_HW_WATCHDOG > -# define CONFIG_XILINX_TB_WATCHDOG > # endif > #endif > >
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index e707b9f..47d4204 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -59,3 +59,4 @@ CONFIG_XILINX_AXIEMAC=y CONFIG_XILINX_EMACLITE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_XILINX_TB_WATCHDOG=y diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fc46b67..bd209fa 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -78,4 +78,10 @@ config WDT_ORION Select this to enable Orion watchdog timer, which can be found on some Marvell Armada chips. +config XILINX_TB_WATCHDOG + bool "Xilinx watchdog timer support" + depends on MICROBLAZE && !SPL_BUILD + help + Available for Xilinx Axi platforms to service timebase watchdog timer. + endmenu diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index de33583..a4d911d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -50,7 +50,6 @@ # define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ # ifndef CONFIG_SPL_BUILD # define CONFIG_HW_WATCHDOG -# define CONFIG_XILINX_TB_WATCHDOG # endif #endif