Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
8c05abad
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8c05abad
编写于
10月 08, 2019
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
上级
efea5a34
ca51ef7c
变更
22
显示空白变更内容
内联
并排
Showing
22 changed file
with
18 addition
and
14 deletion
+18
-14
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
+0
-1
configs/dh_imx6_defconfig
configs/dh_imx6_defconfig
+1
-0
configs/display5_defconfig
configs/display5_defconfig
+1
-0
configs/display5_factory_defconfig
configs/display5_factory_defconfig
+1
-0
configs/ge_bx50v3_defconfig
configs/ge_bx50v3_defconfig
+1
-0
configs/kp_imx6q_tpc_defconfig
configs/kp_imx6q_tpc_defconfig
+1
-0
configs/m53menlo_defconfig
configs/m53menlo_defconfig
+1
-0
configs/mx53ppd_defconfig
configs/mx53ppd_defconfig
+1
-0
configs/tqma6s_wru4_mmc_defconfig
configs/tqma6s_wru4_mmc_defconfig
+1
-0
configs/warp_defconfig
configs/warp_defconfig
+1
-0
drivers/watchdog/Kconfig
drivers/watchdog/Kconfig
+9
-0
include/configs/dh_imx6.h
include/configs/dh_imx6.h
+0
-1
include/configs/display5.h
include/configs/display5.h
+0
-1
include/configs/ge_bx50v3.h
include/configs/ge_bx50v3.h
+0
-2
include/configs/kp_imx6q_tpc.h
include/configs/kp_imx6q_tpc.h
+0
-1
include/configs/m53menlo.h
include/configs/m53menlo.h
+0
-1
include/configs/mx53ppd.h
include/configs/mx53ppd.h
+0
-2
include/configs/socfpga_common.h
include/configs/socfpga_common.h
+0
-1
include/configs/socfpga_stratix10_socdk.h
include/configs/socfpga_stratix10_socdk.h
+0
-1
include/configs/tqma6_wru4.h
include/configs/tqma6_wru4.h
+0
-1
include/configs/warp.h
include/configs/warp.h
+0
-1
scripts/config_whitelist.txt
scripts/config_whitelist.txt
+0
-1
未找到文件。
arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch2
浏览文件 @
8c05abad
...
...
@@ -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,
the default timeout value is 128s which is the maximum. Set 10 seconds for
example:
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 10000
Set CONFIG_WATCHDOG_RESET_DISABLE to disable reset watchdog, so that the
watchdog will not be fed in u-boot.
configs/dh_imx6_defconfig
浏览文件 @
8c05abad
...
...
@@ -85,4 +85,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_IMX_WATCHDOG=y
configs/display5_defconfig
浏览文件 @
8c05abad
...
...
@@ -82,4 +82,5 @@ CONFIG_MII=y
CONFIG_MXC_UART=y
CONFIG_SPI=y
CONFIG_MXC_SPI=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
CONFIG_IMX_WATCHDOG=y
configs/display5_factory_defconfig
浏览文件 @
8c05abad
...
...
@@ -87,5 +87,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
CONFIG_USB_GADGET_PRODUCT_NUM=0x4000
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=15000
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
configs/ge_bx50v3_defconfig
浏览文件 @
8c05abad
...
...
@@ -61,5 +61,6 @@ CONFIG_DM_SPI=y
CONFIG_MXC_SPI=y
CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=6000
CONFIG_IMX_WATCHDOG=y
# CONFIG_EFI_LOADER is not set
configs/kp_imx6q_tpc_defconfig
浏览文件 @
8c05abad
...
...
@@ -41,5 +41,6 @@ CONFIG_FEC_MXC=y
CONFIG_MII=y
CONFIG_IMX_THERMAL=y
CONFIG_USB=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
configs/m53menlo_defconfig
浏览文件 @
8c05abad
...
...
@@ -89,4 +89,5 @@ CONFIG_DM_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
CONFIG_IMX_WATCHDOG=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_FAT_WRITE=y
configs/mx53ppd_defconfig
浏览文件 @
8c05abad
...
...
@@ -50,4 +50,5 @@ CONFIG_USB_EHCI_MX5=y
CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y
configs/tqma6s_wru4_mmc_defconfig
浏览文件 @
8c05abad
...
...
@@ -66,5 +66,6 @@ CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
configs/warp_defconfig
浏览文件 @
8c05abad
...
...
@@ -39,5 +39,6 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
CONFIG_IMX_WATCHDOG=y
CONFIG_OF_LIBFDT=y
drivers/watchdog/Kconfig
浏览文件 @
8c05abad
...
...
@@ -8,6 +8,15 @@ config WATCHDOG
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.
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
bool
...
...
include/configs/dh_imx6.h
浏览文件 @
8c05abad
...
...
@@ -88,7 +88,6 @@
#endif
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
...
...
include/configs/display5.h
浏览文件 @
8c05abad
...
...
@@ -354,7 +354,6 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000
/* ENV config */
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
...
...
include/configs/ge_bx50v3.h
浏览文件 @
8c05abad
...
...
@@ -28,8 +28,6 @@
#define CONFIG_REVISION_TAG
#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000
#define CONFIG_MXC_UART
/* SATA Configs */
...
...
include/configs/kp_imx6q_tpc.h
浏览文件 @
8c05abad
...
...
@@ -60,7 +60,6 @@
#endif
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
...
...
include/configs/m53menlo.h
浏览文件 @
8c05abad
...
...
@@ -153,7 +153,6 @@
#define CONFIG_FSL_IIM
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000
/*
* Boot Linux
...
...
include/configs/mx53ppd.h
浏览文件 @
8c05abad
...
...
@@ -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
#define CONFIG_REVISION_TAG
...
...
include/configs/socfpga_common.h
浏览文件 @
8c05abad
...
...
@@ -108,7 +108,6 @@
#define CONFIG_DESIGNWARE_WATCHDOG
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#define CONFIG_DW_WDT_CLOCK_KHZ 25000
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000
#endif
/*
...
...
include/configs/socfpga_stratix10_socdk.h
浏览文件 @
8c05abad
...
...
@@ -168,7 +168,6 @@ unsigned int cm_get_qspi_controller_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)
#endif
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 3000
#endif
/*
...
...
include/configs/tqma6_wru4.h
浏览文件 @
8c05abad
...
...
@@ -17,7 +17,6 @@
#define CONSOLE_DEV "ttymxc3"
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000
/* Config on-board RTC */
#define CONFIG_RTC_DS1337
...
...
include/configs/warp.h
浏览文件 @
8c05abad
...
...
@@ -25,7 +25,6 @@
#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
/* Watchdog */
#define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000
/* 30s */
#define CONFIG_SYS_MEMTEST_START 0x80000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_256M)
...
...
scripts/config_whitelist.txt
浏览文件 @
8c05abad
...
...
@@ -4339,7 +4339,6 @@ CONFIG_WATCHDOG_NOWAYOUT
CONFIG_WATCHDOG_PRESC
CONFIG_WATCHDOG_RC
CONFIG_WATCHDOG_TIMEOUT
CONFIG_WATCHDOG_TIMEOUT_MSECS
CONFIG_WD_PERIOD
CONFIG_X600
CONFIG_X86EMU_DEBUG
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录