diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:49 -0400 |
| commit | 8c05abad1367e33908ee43c590801e338967838d (patch) | |
| tree | 6644cea40665b66d386b16935ee82c8ecf420d84 /include | |
| parent | efea5a34bb5be542630ce7161bd3b9cc26a0bcf3 (diff) | |
| parent | ca51ef7c0c6140e6590746b07dad19040f95ef60 (diff) | |
| download | u-boot-8c05abad1367e33908ee43c590801e338967838d.zip u-boot-8c05abad1367e33908ee43c590801e338967838d.tar.gz u-boot-8c05abad1367e33908ee43c590801e338967838d.tar.bz2 | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Move WATCHDOG_TIMEOUT_MSECS to Kconfig (Heiko)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/dh_imx6.h | 1 | ||||
| -rw-r--r-- | include/configs/display5.h | 1 | ||||
| -rw-r--r-- | include/configs/ge_bx50v3.h | 2 | ||||
| -rw-r--r-- | include/configs/kp_imx6q_tpc.h | 1 | ||||
| -rw-r--r-- | include/configs/m53menlo.h | 1 | ||||
| -rw-r--r-- | include/configs/mx53ppd.h | 2 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 1 | ||||
| -rw-r--r-- | include/configs/socfpga_stratix10_socdk.h | 1 | ||||
| -rw-r--r-- | include/configs/tqma6_wru4.h | 1 | ||||
| -rw-r--r-- | include/configs/warp.h | 1 |
10 files changed, 0 insertions, 12 deletions
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index c516e6e..a854d0b 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -88,7 +88,6 @@ #endif /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/display5.h b/include/configs/display5.h index e503e4a..182399a 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -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 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 31214a6..6de5119 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -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 */ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 2435ebb..c160ad5 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -60,7 +60,6 @@ #endif /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 49f11ea..113e844 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -153,7 +153,6 @@ #define CONFIG_FSL_IIM /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 /* * Boot Linux diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index d5b54df..59988ef 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_WATCHDOG_TIMEOUT_MSECS 8000 - #define CONFIG_BOARD_LATE_INIT #define CONFIG_REVISION_TAG diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index b11fe02..94268ed 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -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 /* diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h index 7b55dd1..8e6ecf4 100644 --- a/include/configs/socfpga_stratix10_socdk.h +++ b/include/configs/socfpga_stratix10_socdk.h @@ -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 /* diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index 34f000f..0af52e5 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -17,7 +17,6 @@ #define CONSOLE_DEV "ttymxc3" /* Watchdog */ -#define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* Config on-board RTC */ #define CONFIG_RTC_DS1337 diff --git a/include/configs/warp.h b/include/configs/warp.h index 5345f53..41fd6c7 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -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) |