All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig
@ 2018-10-18  9:14 Xiaoliang Yang
  0 siblings, 0 replies; 3+ messages in thread
From: Xiaoliang Yang @ 2018-10-18  9:14 UTC (permalink / raw)
  To: u-boot

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>
---
 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(-)

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 5044a59..c55e39c 100644
--- 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 6641382..95c3063 100644
--- 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 6a31ee6..4082b12 100644
--- 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 2cb7164..92b2377 100644
--- 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 697138e..ab5ec59 100644
--- 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 5962b64..5d1c746 100644
--- 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 729377d..c907779 100644
--- 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 84ca1ce..5ebbe1d 100644
--- 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 7be5c04..34328fd 100644
--- 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 df4c87e..c1be704 100644
--- 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 6a9c91e..63eee27 100644
--- 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 d545b3e..02f4e1e 100644
--- 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 baddd1c..ca974c0 100644
--- 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 6c833e7..9231bd8 100644
--- 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 6d00699..1fb7469 100644
--- 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 fad840b..e0e1f71 100644
--- 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 7043830..b6b27ee 100644
--- 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 bbd4cd7..d2a8e65 100644
--- 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 a945272..34f000f 100644
--- 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 f9c095d..9aa8a48 100644
--- 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 b85c35b..59108b9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig
  2018-10-25  4:24 Xiaoliang Yang
@ 2018-10-25  9:56 ` Lukasz Majewski
  0 siblings, 0 replies; 3+ messages in thread
From: Lukasz Majewski @ 2018-10-25  9:56 UTC (permalink / raw)
  To: u-boot

Hi Xiaoliang,

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

Reviewed-by: Łukasz Majewski <lukma@denx.de>

> 
> Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
> ---
>  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(-)
> 
> diff --git a/configs/aristainetos2_defconfig
> b/configs/aristainetos2_defconfig index 5044a59..c55e39c 100644
> --- 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 6641382..95c3063 100644
> --- 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 6a31ee6..4082b12 100644
> --- 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 2cb7164..92b2377 100644
> --- 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 697138e..ab5ec59 100644
> --- 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 5962b64..5d1c746 100644
> --- 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 729377d..c907779 100644
> --- 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 84ca1ce..5ebbe1d 100644
> --- 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 7be5c04..34328fd 100644
> --- 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 df4c87e..c1be704 100644
> --- 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 6a9c91e..63eee27 100644
> --- 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 d5dbc80..988c702 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -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
> diff --git a/include/configs/aristainetos-common.h
> b/include/configs/aristainetos-common.h index baddd1c..ca974c0 100644
> --- 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 6c833e7..9231bd8 100644
> --- 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 6d00699..1fb7469 100644
> --- 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 fad840b..e0e1f71 100644
> --- 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 7043830..b6b27ee 100644
> --- 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 bbd4cd7..d2a8e65 100644
> --- 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 a945272..34f000f 100644
> --- 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 f9c095d..9aa8a48 100644
> --- 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 b85c35b..59108b9 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -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>

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig
@ 2018-10-25  4:24 Xiaoliang Yang
  2018-10-25  9:56 ` Lukasz Majewski
  0 siblings, 1 reply; 3+ messages in thread
From: Xiaoliang Yang @ 2018-10-25  4:24 UTC (permalink / raw)
  To: u-boot

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>
---
 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(-)

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 5044a59..c55e39c 100644
--- 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 6641382..95c3063 100644
--- 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 6a31ee6..4082b12 100644
--- 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 2cb7164..92b2377 100644
--- 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 697138e..ab5ec59 100644
--- 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 5962b64..5d1c746 100644
--- 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 729377d..c907779 100644
--- 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 84ca1ce..5ebbe1d 100644
--- 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 7be5c04..34328fd 100644
--- 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 df4c87e..c1be704 100644
--- 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 6a9c91e..63eee27 100644
--- 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 d5dbc80..988c702 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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
diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index baddd1c..ca974c0 100644
--- 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 6c833e7..9231bd8 100644
--- 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 6d00699..1fb7469 100644
--- 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 fad840b..e0e1f71 100644
--- 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 7043830..b6b27ee 100644
--- 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 bbd4cd7..d2a8e65 100644
--- 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 a945272..34f000f 100644
--- 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 f9c095d..9aa8a48 100644
--- 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 b85c35b..59108b9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-25  9:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-18  9:14 [U-Boot] [PATCH] Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig Xiaoliang Yang
2018-10-25  4:24 Xiaoliang Yang
2018-10-25  9:56 ` Lukasz Majewski

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.