watchdog: Migrate OMAP_WATCHDOG to Kconfig

Move this entry to Kconfig.  As it is a hardware watchdog, select
HW_WATCHDOG.  While we could default to enabling this for all platforms,
it is currently only enabled by default on AM33XX, so keep that logic
today.

Cc: Roger Meier <r.meier@siemens.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 7d92c139402a7170b284811d4d528c5ad9717b7e..1bdbf90495972bd74c4764269b936a021b9e9f5c 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -57,4 +57,5 @@ CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
+CONFIG_OMAP_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index 9abe61760e1012fbc443b630d7fa30dbc2b0166e..ed7432d7f42d330f7b067ccc74adc0c561c66301 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -57,4 +57,5 @@ CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
+CONFIG_OMAP_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 79bb9057bfc2bc902fea8c75d05629bfcb4e18f5..02b5ff60e21de25bdd174674f43a68c3c2f05553 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -65,4 +65,5 @@ CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
+CONFIG_OMAP_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 2ecdd3c8f68d4ccbc2522428ae3cbf3a5d61b73b..0e50b3109ea25589fd6da9333e3b191979b17cc6 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Siemens AG"
 CONFIG_G_DNL_VENDOR_NUM=0x0908
 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_OMAP_WATCHDOG=y

diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index 7e0b1923b8ac4c49521cf2576bdf8facbb33be31..b6911fd717439e9ad89e727aa78639c8530f0ba4 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Siemens AG"
 CONFIG_G_DNL_VENDOR_NUM=0x0908
 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_OMAP_WATCHDOG=y

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index c40684a81d48c3946fc8f45648620686788ca955..67bdfd63f2596667faf1c8ee24bf4051aaed5eeb 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -72,3 +72,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00
+CONFIG_OMAP_WATCHDOG=y

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index 01848c5702ab778ea96d5f3a16b850a2dae0dbfe..f77d4d4087933d686781189f73145ed2ca81e1cf 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Siemens AG"
 CONFIG_G_DNL_VENDOR_NUM=0x0908
 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_OMAP_WATCHDOG=y

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index dd61ead647cd56cdec449c11c09da39a486183a0..914f70fd6a01ae97960d32dbeaede1f3265d8c03 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -65,3 +65,4 @@ CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Siemens AG"
 CONFIG_G_DNL_VENDOR_NUM=0x0908
 CONFIG_G_DNL_PRODUCT_NUM=0x02d2
+CONFIG_OMAP_WATCHDOG=y

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index bdaf5d4101d2e5c7c73581c3f759e7b0bc7ac86a..22a7c4f80180d804d6c69e8645de6705fef257f9 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -12,6 +12,14 @@ config BCM2835_WDT
          This provides basic infrastructure to support BCM2835/2836 watchdog
          hardware, with a max timeout of ~15secs.
 
+config OMAP_WATCHDOG
+       bool "TI OMAP watchdog driver"
+       depends on ARCH_OMAP2PLUS
+       select HW_WATCHDOG
+       default y if AM33XX
+       help
+         Say Y here to enable the OMAP3+ watchdog driver.
+       
 config ULP_WATCHDOG
        bool "i.MX7ULP watchdog"
        help

diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h
index 0c1a54d7ba2e6ba4ab0ca33076df2ac42f68e3aa..521d097f8a9643bcbcfe7f673500117992c0ba56 100644 (file)
--- a/include/configs/brppt1.h
+++ b/include/configs/brppt1.h
@@ -20,9 +20,6 @@
 #define CONFIG_LCD_DT_SIMPLEFB
 #define LCD_BPP                                LCD_COLOR32
 
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_OMAP_WATCHDOG
-
 /* Bootcount using the RTC block */
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
 #define CONFIG_BOOTCOUNT_LIMIT

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 896d14f99a977b95a4e12c5956421a8e7861996c..ba6a43062a6301651f4e73c8e30c22a31902609e 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -45,9 +45,6 @@
 
 #define CONFIG_FACTORYSET
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND    0x2E0000
 #define CONFIG_ENV_SIZE_REDUND      0x2000

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 40c57948ccd47a86ff2497b7b8e16e1655da4bf2..a0152a4a43e94b00855cd0d018e41702b7263482 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -116,9 +116,6 @@
 #define CONFIG_SYS_DCACHE_OFF
 #endif
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND       0xB80000
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 57f034f0df61d725dc9ea1962452c0c6f6839801..e8e0c7edd89eb97b670c51ab2770122cb72bde8d 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -42,9 +42,6 @@
 
 #define CONFIG_FACTORYSET
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
 #ifndef CONFIG_SPL_BUILD
 
 /* Use common default */

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 99fe1616e555525247d66de1d5a5d89b971919d3..0820f6fc7a3fbce01dfeb1348627ff5ac904e973 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -49,9 +49,6 @@
 
 #define CONFIG_FACTORYSET
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND       0x2E0000
 #define CONFIG_ENV_SIZE_REDUND         0x2000

diff --git a/include/configs/rut.h b/include/configs/rut.h
index 8cfb73d781379f538430e03bf28a0c76240eb060..e676a5acd481a81861aef343c5303c864714056e 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -110,10 +110,6 @@
 
 #endif /* CONFIG_SPL_BUILD */
 
-#ifdef CONFIG_SPL_BUILD
-#undef CONFIG_HW_WATCHDOG
-#endif
-
 #if defined(CONFIG_VIDEO)
 #define CONFIG_VIDEO_DA8XX
 #define CONFIG_SPLASH_SCREEN

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 81586969e2637e0f32bf18be9dc506079f61867b..5bb471c8f605c4a2f929b5dc6aa6f5fe8ad2d036 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -547,9 +547,6 @@
 #endif
 #endif
 
-/* Watchdog */
-#define CONFIG_HW_WATCHDOG
-
 /* Reboot after 60 sec if bootcmd fails */
 #define CONFIG_RESET_TO_RETRY
 #define CONFIG_BOOT_RETRY_TIME 60

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 8c37d7cace8c7eef28d14416651addeb267745db..cea84acd03c1c92f009a6f9aeb9c2e9340ba75dc 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -42,9 +42,6 @@
 
 #define CONFIG_FACTORYSET
 
-/* Watchdog */
-#define CONFIG_OMAP_WATCHDOG
-
 /* Define own nand partitions */
 #define CONFIG_ENV_OFFSET_REDUND    0x2E0000
 #define CONFIG_ENV_SIZE_REDUND      0x2000

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index e4c3c807f21d13180261ec3f5114f8c8cb2c654b..bf44121a0fe6f5331b9504dbe1af77e8c9c684ab 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -47,10 +47,6 @@
  */
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x44E3E000
 
-/* Enable the HW watchdog, since we can use this with bootcount */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_OMAP_WATCHDOG
-
 /*
  * SPL related defines.  The Public RAM memory map the ROM defines the
  * area between 0x402F0400 and 0x4030B800 as a download area and

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ebe3fd7996de41d281f37eeb0378019ac33f5d11..e86e7388dce5762c3b118f01941eec091c595a5b 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1988,7 +1988,6 @@ CONFIG_OMAP_USB2PHY2_HOST
 CONFIG_OMAP_USB3PHY1_HOST
 CONFIG_OMAP_USB_PHY
 CONFIG_OMAP_VC_I2C_HS_MCODE
-CONFIG_OMAP_WATCHDOG
 CONFIG_OPTREX_BW
 CONFIG_ORIGEN
 CONFIG_OS1_ENV_ADDR