Skip to contentSkip to conversation

Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig

PATCH New Xiaoliang Yang 2 participants 2 messages Oct 25, 2018

Subsystems (2)
Arm i.MX and Layerscape Watchdog device drivers
lore
Share & tools
lore

Xiaoliang Yang

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 configs/aristainetos2_defconfig       |    1 +
 configs/aristainetos2b_defconfig      |    1 +
 configs/aristainetos_defconfig        |    1 +
 configs/dh_imx6_defconfig             |    1 +
 configs/display5_defconfig            |    1 +
 configs/display5_factory_defconfig    |    1 +
 configs/ge_bx50v3_defconfig           |    1 +
 configs/kp_imx6q_tpc_defconfig        |    1 +
 configs/mx53ppd_defconfig             |    1 +
 configs/tqma6s_wru4_mmc_defconfig     |    1 +
 configs/warp_defconfig                |    1 +
 drivers/watchdog/Kconfig              |    7 +++++++
 include/configs/aristainetos-common.h |    3 ---
 include/configs/dh_imx6.h             |    2 --
 include/configs/display5.h            |    2 --
 include/configs/ge_bx50v3.h           |    2 --
 include/configs/kp_imx6q_tpc.h        |    2 --
 include/configs/mx53ppd.h             |    2 --
 include/configs/tqma6_wru4.h          |    2 --
 include/configs/warp.h                |    2 --
 scripts/config_whitelist.txt          |    1 -
 21 files changed, 18 insertions(+), 18 deletions(-)
configs/aristainetos2_defconfig +1 -0
index 5044a59..c55e39c 100644
@@ -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
configs/aristainetos2b_defconfig +1 -0
index 6641382..95c3063 100644
@@ -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
configs/aristainetos_defconfig +1 -0
index 6a31ee6..4082b12 100644
@@ -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
configs/dh_imx6_defconfig +1 -0
index 2cb7164..92b2377 100644
@@ -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
configs/display5_defconfig +1 -0
index 697138e..ab5ec59 100644
@@ -75,3 +75,4 @@ CONFIG_MII=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
+CONFIG_IMX_WATCHDOG=y
configs/display5_factory_defconfig +1 -0
index 5962b64..5d1c746 100644
@@ -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
configs/ge_bx50v3_defconfig +1 -0
index 729377d..c907779 100644
@@ -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
configs/kp_imx6q_tpc_defconfig +1 -0
index 84ca1ce..5ebbe1d 100644
@@ -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
configs/mx53ppd_defconfig +1 -0
index 7be5c04..34328fd 100644
@@ -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
configs/tqma6s_wru4_mmc_defconfig +1 -0
index df4c87e..c1be704 100644
@@ -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
configs/warp_defconfig +1 -0
index 6a9c91e..63eee27 100644
@@ -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
drivers/watchdog/Kconfig +7 -0
index d5dbc80..988c702 100644
@@ -117,4 +117,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
include/configs/aristainetos-common.h +0 -3
index baddd1c..ca974c0 100644
@@ -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 */
include/configs/dh_imx6.h +0 -2
index 6c833e7..9231bd8 100644
@@ -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 */
include/configs/display5.h +0 -2
index 6d00699..1fb7469 100644
@@ -368,8 +368,6 @@
 /* Commands */
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
 
 /* ENV config */
include/configs/ge_bx50v3.h +0 -2
index fad840b..e0e1f71 100644
@@ -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
include/configs/kp_imx6q_tpc.h +0 -2
index 7043830..b6b27ee 100644
@@ -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 */
include/configs/mx53ppd.h +0 -2
index bbd4cd7..d2a8e65 100644
@@ -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
include/configs/tqma6_wru4.h +0 -2
index a945272..34f000f 100644
@@ -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 */
include/configs/warp.h +0 -2
index f9c095d..9aa8a48 100644
@@ -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
scripts/config_whitelist.txt +0 -1
index b85c35b..59108b9 100644
@@ -964,7 +964,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
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig

Hi Xiaoliang,

Quoted 2 lines

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

Reviewed-by Łukasz Majewski <[email protected]>
Quoted 263 lines
Signed-off-by Xiaoliang Yang <[email protected]>
---
 configs/aristainetos2_defconfig       |    1 +
 configs/aristainetos2b_defconfig      |    1 +
 configs/aristainetos_defconfig        |    1 +
 configs/dh_imx6_defconfig             |    1 +
 configs/display5_defconfig            |    1 +
 configs/display5_factory_defconfig    |    1 +
 configs/ge_bx50v3_defconfig           |    1 +
 configs/kp_imx6q_tpc_defconfig        |    1 +
 configs/mx53ppd_defconfig             |    1 +
 configs/tqma6s_wru4_mmc_defconfig     |    1 +
 configs/warp_defconfig                |    1 +
 drivers/watchdog/Kconfig              |    7 +++++++
 include/configs/aristainetos-common.h |    3 ---
 include/configs/dh_imx6.h             |    2 --
 include/configs/display5.h            |    2 --
 include/configs/ge_bx50v3.h           |    2 --
 include/configs/kp_imx6q_tpc.h        |    2 --
 include/configs/mx53ppd.h             |    2 --
 include/configs/tqma6_wru4.h          |    2 --
 include/configs/warp.h                |    2 --
 scripts/config_whitelist.txt          |    1 -
 21 files changed, 18 insertions(+), 18 deletions(-)
(quoted diff) +0 -0

b/configs/aristainetos2_defconfig index 5044a59..c55e39c 100644

configs/aristainetos2_defconfig +1 -0
@@ -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
(quoted diff) +0 -0

b/configs/aristainetos2b_defconfig index 6641382..95c3063 100644

configs/aristainetos2b_defconfig +1 -0
@@ -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
(quoted diff) +0 -0

b/configs/aristainetos_defconfig index 6a31ee6..4082b12 100644

configs/aristainetos_defconfig +1 -0
@@ -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
configs/dh_imx6_defconfig +1 -0
index 2cb7164..92b2377 100644
@@ -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
configs/display5_defconfig +1 -0
index 697138e..ab5ec59 100644
@@ -75,3 +75,4 @@ CONFIG_MII=y
 CONFIG_MXC_UART=y
 CONFIG_SPI=y
 CONFIG_MXC_SPI=y
+CONFIG_IMX_WATCHDOG=y
(quoted diff) +0 -0

b/configs/display5_factory_defconfig index 5962b64..5d1c746 100644

configs/display5_factory_defconfig +1 -0
@@ -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
configs/ge_bx50v3_defconfig +1 -0
index 729377d..c907779 100644
@@ -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
(quoted diff) +0 -0

b/configs/kp_imx6q_tpc_defconfig index 84ca1ce..5ebbe1d 100644

configs/kp_imx6q_tpc_defconfig +1 -0
@@ -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
configs/mx53ppd_defconfig +1 -0
index 7be5c04..34328fd 100644
@@ -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
(quoted diff) +0 -0

b/configs/tqma6s_wru4_mmc_defconfig index df4c87e..c1be704 100644

configs/tqma6s_wru4_mmc_defconfig +1 -0
@@ -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
configs/warp_defconfig +1 -0
index 6a9c91e..63eee27 100644
@@ -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
drivers/watchdog/Kconfig +0 -0
index d5dbc80..988c702 100644
@@ -117,4 +117,11 @@ config XILINX_TB_WATCHDOG
 	   Select this to enable Xilinx Axi watchdog timer, which

can be found on some Xilinx Microblaze Platforms.

drivers/watchdog/Kconfig +5 -0
+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

drivers/watchdog/Kconfig +2 -0
+	   driver.
+
 endmenu
(quoted diff) +0 -0

b/include/configs/aristainetos-common.h index baddd1c..ca974c0 100644

include/configs/aristainetos-common.h +0 -3
@@ -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 */
include/configs/dh_imx6.h +0 -2
index 6c833e7..9231bd8 100644
@@ -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 */
include/configs/display5.h +0 -2
index 6d00699..1fb7469 100644
@@ -368,8 +368,6 @@
 /* Commands */
 
 /* Watchdog */
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_IMX_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT_MSECS   15000
 
 /* ENV config */
include/configs/ge_bx50v3.h +0 -2
index fad840b..e0e1f71 100644
@@ -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
(quoted diff) +0 -0

b/include/configs/kp_imx6q_tpc.h index 7043830..b6b27ee 100644

include/configs/kp_imx6q_tpc.h +0 -2
@@ -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 */
include/configs/mx53ppd.h +0 -2
index bbd4cd7..d2a8e65 100644
@@ -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
(quoted diff) +0 -0

b/include/configs/tqma6_wru4.h index a945272..34f000f 100644

include/configs/tqma6_wru4.h +0 -2
@@ -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 */
include/configs/warp.h +0 -2
index f9c095d..9aa8a48 100644
@@ -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
(quoted diff) +0 -0

b/scripts/config_whitelist.txt index b85c35b..59108b9 100644

scripts/config_whitelist.txt CONFIG_IMX_HDMI · line 969

Quoted 7 lines
scripts/config_whitelist.txt +0 -1
@@ -964,7 +964,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

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181025/9a31f485/attachment.sig>