Skip to content

U
U-Boot.Mirror

OS / U-Boot.Mirror

通知 1
Star 0
Fork 0
U
U-Boot.Mirror

体验新版 GitCode，发现更多精彩内容 >>

提交 8c05abad 编写于 作者: T Tom Rini
浏览文件
操作

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell 

- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
上级 efea5a34 ca51ef7c
隐藏空白更改
内联 并排
Showing with 18 addition and 14 deletion
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
浏览文件 @ 8c05abad
...@@ -16,6 +16,5 @@ You can enable it by setting CONFIG_IMX_WATCHDOG. ...@@ -16,6 +16,5 @@ You can enable it by setting CONFIG_IMX_WATCHDOG.
Use following config to set watchdog timeout, if this config is not defined, Use following config to set watchdog timeout, if this config is not defined,
the default timeout value is 128s which is the maximum. Set 10 seconds for the default timeout value is 128s which is the maximum. Set 10 seconds for
example: example:
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 10000
Set CONFIG_WATCHDOG_RESET_DISABLE to disable reset watchdog, so that the Set CONFIG_WATCHDOG_RESET_DISABLE to disable reset watchdog, so that the
watchdog will not be fed in u-boot. watchdog will not be fed in u-boot.
configs/dh_imx6_defconfig
浏览文件 @ 8c05abad
...@@ -85,4 +85,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -85,4 +85,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_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
configs/display5_defconfig
浏览文件 @ 8c05abad
...@@ -82,4 +82,5 @@ CONFIG_MII=y ...@@ -82,4 +82,5 @@ 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_WATCHDOG_TIMEOUT_MSECS=15000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
configs/display5_factory_defconfig
浏览文件 @ 8c05abad
...@@ -87,5 +87,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 ...@@ -87,5 +87,6 @@ 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_WATCHDOG_TIMEOUT_MSECS=15000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
configs/ge_bx50v3_defconfig
浏览文件 @ 8c05abad
...@@ -61,5 +61,6 @@ CONFIG_DM_SPI=y ...@@ -61,5 +61,6 @@ CONFIG_DM_SPI=y
CONFIG_MXC_SPI=y CONFIG_MXC_SPI=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=6000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
# CONFIG_EFI_LOADER is not set # CONFIG_EFI_LOADER is not set
configs/kp_imx6q_tpc_defconfig
浏览文件 @ 8c05abad
...@@ -41,5 +41,6 @@ CONFIG_FEC_MXC=y ...@@ -41,5 +41,6 @@ CONFIG_FEC_MXC=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_IMX_THERMAL=y CONFIG_IMX_THERMAL=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
configs/m53menlo_defconfig
浏览文件 @ 8c05abad
...@@ -89,4 +89,5 @@ CONFIG_DM_VIDEO=y ...@@ -89,4 +89,5 @@ CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_FAT_WRITE=y CONFIG_FAT_WRITE=y
configs/mx53ppd_defconfig
浏览文件 @ 8c05abad
...@@ -50,4 +50,5 @@ CONFIG_USB_EHCI_MX5=y ...@@ -50,4 +50,5 @@ CONFIG_USB_EHCI_MX5=y
CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set # CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
configs/tqma6s_wru4_mmc_defconfig
浏览文件 @ 8c05abad
...@@ -66,5 +66,6 @@ CONFIG_USB=y ...@@ -66,5 +66,6 @@ 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_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
configs/warp_defconfig
浏览文件 @ 8c05abad
...@@ -39,5 +39,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 ...@@ -39,5 +39,6 @@ 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_WATCHDOG_TIMEOUT_MSECS=30000
CONFIG_IMX_WATCHDOG=y CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
drivers/watchdog/Kconfig
浏览文件 @ 8c05abad
...@@ -8,6 +8,15 @@ config WATCHDOG ...@@ -8,6 +8,15 @@ config WATCHDOG
this option if you want to service enabled watchdog by U-Boot. Disable this option if you want to service enabled watchdog by U-Boot. Disable
this option if you want U-Boot to start watchdog but never service it. this option if you want U-Boot to start watchdog but never service it.
config WATCHDOG_TIMEOUT_MSECS
int "Watchdog timeout in msec"
default 128000 if ARCH_MX25 || ARCH_MX31 || ARCH_MX5 || ARCH_MX6
default 128000 if ARCH_MX7 || ARCH_VF610
default 30000 if ARCH_SOCFPGA
default 60000
help
Watchdog timeout in msec
config HW_WATCHDOG config HW_WATCHDOG
bool bool
......
include/configs/dh_imx6.h
浏览文件 @ 8c05abad
...@@ -88,7 +88,6 @@ ...@@ -88,7 +88,6 @@
#endif #endif
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
......
include/configs/display5.h
浏览文件 @ 8c05abad
...@@ -354,7 +354,6 @@ ...@@ -354,7 +354,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000
/* ENV config */ /* ENV config */
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
......
include/configs/ge_bx50v3.h
浏览文件 @ 8c05abad
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,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_WATCHDOG_TIMEOUT_MSECS 6000
#define CONFIG_MXC_UART #define CONFIG_MXC_UART
/* SATA Configs */ /* SATA Configs */
......
include/configs/kp_imx6q_tpc.h
浏览文件 @ 8c05abad
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
#endif #endif
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */ /* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OVERWRITE
......
include/configs/m53menlo.h
浏览文件 @ 8c05abad
...@@ -153,7 +153,6 @@ ...@@ -153,7 +153,6 @@
#define CONFIG_FSL_IIM #define CONFIG_FSL_IIM
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
/* /*
* Boot Linux * Boot Linux
......
include/configs/mx53ppd.h
浏览文件 @ 8c05abad
...@@ -22,8 +22,6 @@ ...@@ -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_WATCHDOG_TIMEOUT_MSECS 8000
#define CONFIG_BOARD_LATE_INIT #define CONFIG_BOARD_LATE_INIT
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
......
include/configs/socfpga_common.h
浏览文件 @ 8c05abad
...@@ -108,7 +108,6 @@ ...@@ -108,7 +108,6 @@
#define CONFIG_DESIGNWARE_WATCHDOG #define CONFIG_DESIGNWARE_WATCHDOG
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#define CONFIG_DW_WDT_CLOCK_KHZ 25000 #define CONFIG_DW_WDT_CLOCK_KHZ 25000
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000
#endif #endif
/* /*
......
include/configs/socfpga_stratix10_socdk.h
浏览文件 @ 8c05abad
...@@ -168,7 +168,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); ...@@ -168,7 +168,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
unsigned int cm_get_l4_sys_free_clk_hz(void); unsigned int cm_get_l4_sys_free_clk_hz(void);
#define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000) #define CONFIG_DW_WDT_CLOCK_KHZ (cm_get_l4_sys_free_clk_hz() / 1000)
#endif #endif
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000
#endif #endif
/* /*
......
include/configs/tqma6_wru4.h
浏览文件 @ 8c05abad
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#define CONSOLE_DEV "ttymxc3" #define CONSOLE_DEV "ttymxc3"
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* Config on-board RTC */ /* Config on-board RTC */
#define CONFIG_RTC_DS1337 #define CONFIG_RTC_DS1337
......
include/configs/warp.h
浏览文件 @ 8c05abad
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
/* Watchdog */ /* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */
#define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M)
......
scripts/config_whitelist.txt
浏览文件 @ 8c05abad
...@@ -4339,7 +4339,6 @@ CONFIG_WATCHDOG_NOWAYOUT ...@@ -4339,7 +4339,6 @@ CONFIG_WATCHDOG_NOWAYOUT
CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_PRESC
CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_RC
CONFIG_WATCHDOG_TIMEOUT CONFIG_WATCHDOG_TIMEOUT
CONFIG_WATCHDOG_TIMEOUT_MSECS
CONFIG_WD_PERIOD CONFIG_WD_PERIOD
CONFIG_X600 CONFIG_X600
CONFIG_X86EMU_DEBUG CONFIG_X86EMU_DEBUG
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或