leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig

Browse Source 
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>
This commit is contained in:
Xiaoliang Yang 2018-10-18 17:14:19 +08:00 committed by Stefano Babic
parent f767a4e82e
commit 517066a709
21 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/aristainetos2_defconfig
View File

@ -50,4 +50,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/aristainetos2b_defconfig
View File

@ -50,4 +50,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/aristainetos_defconfig
View File

@ -49,4 +49,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/dh_imx6_defconfig
View File

@ -59,4 +59,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/display5_defconfig
View File

@ -75,3 +75,4 @@ CONFIG_MII=y
CONFIG_MXC_UART=y CONFIG_MXC_UART=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_MXC_SPI=y CONFIG_MXC_SPI=y
CONFIG_IMX_WATCHDOG=y

1
configs/display5_factory_defconfig
View File

@ -82,4 +82,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/ge_bx50v3_defconfig
View File

@ -41,5 +41,6 @@ CONFIG_CMD_E1000=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_MXC_SPI=y CONFIG_MXC_SPI=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set

1
configs/kp_imx6q_tpc_defconfig
View File

@ -40,4 +40,5 @@ CONFIG_MII=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/mx53ppd_defconfig
View File

@ -37,4 +37,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/tqma6s_wru4_mmc_defconfig
View File

@ -65,4 +65,5 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/warp_defconfig
View File

@ -37,4 +37,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

7
drivers/watchdog/Kconfig
View File

@ -111,4 +111,11 @@ config XILINX_TB_WATCHDOG
Select this to enable Xilinx Axi watchdog timer, which can be found on some Select this to enable Xilinx Axi watchdog timer, which can be found on some
Xilinx Microblaze Platforms. 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 endmenu

3
include/configs/aristainetos-common.h
View File

@ -192,9 +192,6 @@
/* UBI support */ /* UBI support */
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
/* Framebuffer */ /* Framebuffer */
#define CONFIG_VIDEO_IPUV3 #define CONFIG_VIDEO_IPUV3
/* check this console not needed, after test remove it */ /* check this console not needed, after test remove it */

2
include/configs/dh_imx6.h
View File

@ -109,8 +109,6 @@
#endif #endif
/* Watchdog */ /* Watchdog */
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */

2
include/configs/display5.h
View File

@ -368,8 +368,6 @@
/* Commands */ /* Commands */
/* Watchdog */ /* Watchdog */
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000
/* ENV config */ /* ENV config */

2
include/configs/ge_bx50v3.h
View File

@ -31,8 +31,6 @@
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
#define CONFIG_MXC_UART #define CONFIG_MXC_UART

2
include/configs/kp_imx6q_tpc.h
View File

@ -67,8 +67,6 @@
#endif #endif
/* Watchdog */ /* Watchdog */
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */

2
include/configs/mx53ppd.h
View File

@ -22,8 +22,6 @@
/* Size of malloc() pool */ /* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT

2
include/configs/tqma6_wru4.h
View File

@ -17,8 +17,6 @@
#define CONSOLE_DEV "ttymxc3" #define CONSOLE_DEV "ttymxc3"
/* Watchdog */ /* Watchdog */
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* Config on-board RTC */ /* Config on-board RTC */

2
include/configs/warp.h
View File

@ -26,8 +26,6 @@
#define CONFIG_SUPPORT_EMMC_BOOT #define CONFIG_SUPPORT_EMMC_BOOT
/* Watchdog */ /* Watchdog */
#define CONFIG_HW_WATCHDOG
#define CONFIG_IMX_WATCHDOG
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */ #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
#define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_START 0x80000000

1
scripts/config_whitelist.txt
View File

@ -963,7 +963,6 @@ CONFIG_IMX_HDMI
CONFIG_IMX_NAND CONFIG_IMX_NAND
CONFIG_IMX_OTP CONFIG_IMX_OTP
CONFIG_IMX_VIDEO_SKIP CONFIG_IMX_VIDEO_SKIP
CONFIG_IMX_WATCHDOG
CONFIG_INETSPACE_V2 CONFIG_INETSPACE_V2
CONFIG_INITRD_TAG CONFIG_INITRD_TAG
CONFIG_INIT_CRITICAL CONFIG_INIT_CRITICAL