Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig

Move this option to Kconfig and tidy up the config file of eight
boards which use it.

Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 5044a595fed1a31bbe006c57742e07acdc4754ff..c55e39c9970825f2f1e25597ee38d62d26bd1b81 100644 (file)
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -50,4 +50,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index 66413824dabb679e0f102f952b8100ba8138eead..95c30632c1c1c57318b129529446d20a6c62f01a 100644 (file)
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -50,4 +50,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index 6a31ee69c2ea270e3cfd583367ffa8da8b3567af..4082b121cd32dabb985e23abc74c9290e4cea53f 100644 (file)
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -49,4 +49,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 2cb716479fb7c67b75d54206544d9d3e12406197..92b23778ef0ce25b7a30426d65c1b82284410534 100644 (file)
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -59,4 +59,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 697138eede31ababa488a4c481a54090c0651ed6..ab5ec59343bfb5854da144f20ad927770c294847 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -75,3 +75,4 @@ CONFIG_MII=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
+CONFIG_IMX_WATCHDOG=y

diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index 5962b642b27f4275504614ccf8c5cffcae42168c..5d1c746205563d4dbd8a726114f2369469c51b6f 100644 (file)
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -82,4 +82,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index 729377d43818cee4d65d2a7f649b29dd2dc1862f..c907779636a51c44a6aa249ee8ac5f9ee93abda7 100644 (file)
--- a/configs/ge_bx50v3_defconfig
+++ b/configs/ge_bx50v3_defconfig
@@ -41,5 +41,6 @@ CONFIG_CMD_E1000=y
 CONFIG_MII=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig
index 84ca1ceb9bf154fcbdecf650872c2dbaf2df41e7..5ebbe1dc7c6b9ccf6369b9d9c4c3c62fb8b29bd9 100644 (file)
--- a/configs/kp_imx6q_tpc_defconfig
+++ b/configs/kp_imx6q_tpc_defconfig
@@ -40,4 +40,5 @@ CONFIG_MII=y
 CONFIG_IMX_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index 7be5c04125313ad8ad4fb42b4626ada5f9d5c8b5..34328fd016205c5f872d969dcc96159be0207a2f 100644 (file)
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -37,4 +37,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y
 # CONFIG_VIDEO_SW_CURSOR is not set
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig
index df4c87eea64fc93d02b4f1644ea559f70f214f03..c1be70464779501804cb2729c7b4232edbe63223 100644 (file)
--- a/configs/tqma6s_wru4_mmc_defconfig
+++ b/configs/tqma6s_wru4_mmc_defconfig
@@ -65,4 +65,5 @@ CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 6a9c91e18ec87ff4066cbdcdaf124211996f0abe..63eee273064b4298084f706e653442095ae07d5f 100644 (file)
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -37,4 +37,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_IMX_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d545b3e00072361d58bff9f598df23d6de7c0d75..02f4e1e32fc7505bb1b67c017868825fa582bf35 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -111,4 +111,11 @@ config XILINX_TB_WATCHDOG
           Select this to enable Xilinx Axi watchdog timer, which can be found on some
           Xilinx Microblaze Platforms.
 
+config IMX_WATCHDOG
+       bool "Enable Watchdog Timer support for IMX and LSCH2 of NXP"
+       select HW_WATCHDOG
+       help
+          Select this to enable the IMX and LSCH2 of Layerscape watchdog
+          driver.
+
 endmenu

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index baddd1c330c8183d0663095a1239602dedfbe5dc..ca974c015f195e5a245af0c53c6fb7703f8bb1a5 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -192,9 +192,6 @@
 
 /* UBI support */
 
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
-
 /* Framebuffer */
 #define CONFIG_VIDEO_IPUV3
 /* check this console not needed, after test remove it */

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 6c833e7a27bab90ca0d0abbcf206e3b1c38e24ce..9231bd853f4afbd29ca8da2adb6565cd532aa31b 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -109,8 +109,6 @@
 #endif
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS  60000
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 6d00699ebd0187aa8cdfb74db842e5728821144a..1fb74691826f94ab7e62855242de78bbbbfe6228 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -368,8 +368,6 @@
 /* Commands */
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
 
 /* ENV config */

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index fad840b9b2ba91596ac308760359a719fc9fd2df..e0e1f713efc4faa05ebc37fe1b8cb5da7384af12 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -31,8 +31,6 @@
 #define CONFIG_REVISION_TAG
 #define CONFIG_SYS_MALLOC_LEN          (10 * SZ_1M)
 
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
 
 #define CONFIG_MXC_UART

diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 704383090f01ac7d45b6467232649714f439393c..b6b27ee1d5eba0da11703efd8f0d952da07827ff 100644 (file)
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -67,8 +67,6 @@
 #endif
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS  60000
 
 /* allow to overwrite serial and ethaddr */

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index bbd4cd78cd3f304a71230f1582af957696007c0d..d2a8e6571af6ffea6cbe294ffc5e1268c4b9dd75 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -22,8 +22,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
 
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
 
 #define CONFIG_BOARD_LATE_INIT

diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index a945272595d9a18ea2e04c9c4b9c8fa69f03e544..34f000f2145a9d148a9538da1e5b6e9eb21d1fc3 100644 (file)
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -17,8 +17,6 @@
 #define CONSOLE_DEV            "ttymxc3"
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS  60000
 
 /* Config on-board RTC */

diff --git a/include/configs/warp.h b/include/configs/warp.h
index f9c095dad3cd640680fb34c8c4b430237526e466..9aa8a48d3d853f37ab6570d8190eeefb316ad098 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -26,8 +26,6 @@
 #define CONFIG_SUPPORT_EMMC_BOOT
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
 
 #define CONFIG_SYS_MEMTEST_START       0x80000000

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5ca650ad5bc4760fe8bd086973218eaba0a3ede4..fe82419d667cdd9bcc5b02f1157d0a826885771f 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -963,7 +963,6 @@ CONFIG_IMX_HDMI
 CONFIG_IMX_NAND
 CONFIG_IMX_OTP
 CONFIG_IMX_VIDEO_SKIP
-CONFIG_IMX_WATCHDOG
 CONFIG_INETSPACE_V2
 CONFIG_INITRD_TAG
 CONFIG_INIT_CRITICAL