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>
@@ -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
@@ -49,4 +49,5 @@ CONFIG_USB=y
@@ -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
@@ -75,3 +75,4 @@ CONFIG_MII=y
CONFIG_MXC_UART=y
CONFIG_SPI=y
CONFIG_MXC_SPI=y
@@ -82,4 +82,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
@@ -41,5 +41,6 @@ CONFIG_CMD_E1000=y
CONFIG_MII=y
# CONFIG_EFI_LOADER is not set
@@ -40,4 +40,5 @@ CONFIG_MII=y
CONFIG_IMX_THERMAL=y
CONFIG_USB=y
@@ -37,4 +37,5 @@ CONFIG_USB=y
@@ -65,4 +65,5 @@ CONFIG_USB=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y
@@ -37,4 +37,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -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
@@ -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 */
@@ -109,8 +109,6 @@
#endif
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */
@@ -368,8 +368,6 @@
/* Commands */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000
/* ENV config */
@@ -31,8 +31,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
#define CONFIG_MXC_UART
@@ -67,8 +67,6 @@
@@ -22,8 +22,6 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
#define CONFIG_BOARD_LATE_INIT
@@ -17,8 +17,6 @@
#define CONSOLE_DEV "ttymxc3"
/* Config on-board RTC */
@@ -26,8 +26,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
#define CONFIG_SYS_MEMTEST_START 0x80000000
@@ -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