diff mbox series

[U-Boot,v2,2/2] microblaze: wdt: Added Kconfig support for CONFIG_XILINX_TB_WATCHDOG

Message ID 1519797742-6762-2-git-send-email-vipulk@xilinx.com
State Changes Requested
Delegated to: Michal Simek
Headers show
Series microblaze: Moved U-boot headers to Kconfig | expand

Commit Message

Vipul Kumar Feb. 28, 2018, 6:02 a.m. UTC 
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>
---
- Changes in v2:
- Added select HW_WATCHDOG
- Branch: u-boot-microblaze/kconfig
---
 configs/microblaze-generic_defconfig | 1 +
 drivers/watchdog/Kconfig             | 7 +++++++
 include/configs/microblaze-generic.h | 1 -
 3 files changed, 8 insertions(+), 1 deletion(-)

--
2.7.4

This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

Comments

Michal Simek March 1, 2018, 2:57 p.m. UTC | #1 
On 28.2.2018 07:02, 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>
> ---
> - Changes in v2:
> - Added select HW_WATCHDOG
> - Branch: u-boot-microblaze/kconfig
> ---
>  configs/microblaze-generic_defconfig | 1 +
>  drivers/watchdog/Kconfig             | 7 +++++++
>  include/configs/microblaze-generic.h | 1 -
>  3 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
> index 699dc44..fba3820 100644
> --- a/configs/microblaze-generic_defconfig
> +++ b/configs/microblaze-generic_defconfig
> @@ -63,3 +63,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..a1e9432 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -78,4 +78,11 @@ 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

Based on my chat with Tom this is not working and
that needs to be done at the code/Makefile level.

> +	select HW_WATCHDOG
> +	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 73c3c2a..391b26a 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
>  
> 

When this is applied there is compilation warning.
I think that will be just easier to convert this driver to DM and ged
rid of all these configs.

Or don't select hw_watchdog via Kconfig even that dependency is there.

M

diff --git a/configs/microblaze-generic_defconfig
b/configs/microblaze-generic_defconfig
index 699dc447f0ff..fba382037a76 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -63,3 +63,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 fc46b6774d57..3a55ae08abd8 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
+       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 73c3c2ae485c..391b26ae82c5 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 mbox series

Patch

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 699dc44..fba3820 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -63,3 +63,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..a1e9432 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -78,4 +78,11 @@  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
+       select HW_WATCHDOG
+       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 73c3c2a..391b26a 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