mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
m68k: Rename CONFIG_WATCHDOG_TIMEOUT to CONFIG_WATCHDOG_TIMEOUT_MSECS
In practice, it is clear that the usage in m68k of CONFIG_WATCHDOG_TIMEOUT is setting a value in milliseconds. Rename this to the existing symbol and move to Kconfig. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -15,8 +15,6 @@
|
||||
*/
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000
|
||||
|
||||
/* I2C */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
|
||||
@@ -20,8 +20,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
|
||||
|
||||
/* I2C */
|
||||
#define CFG_SYS_I2C_PINMUX_REG (gpio->par_qspi)
|
||||
#define CFG_SYS_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
|
||||
|
||||
@@ -19,8 +19,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 10000 /* timeout in milliseconds */
|
||||
|
||||
#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */
|
||||
|
||||
/* Configuration for environment
|
||||
|
||||
@@ -20,8 +20,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
# define CFG_SYS_TX_ETH_BUFFER 8
|
||||
# define CFG_SYS_FEC_BUF_USE_SRAM
|
||||
|
||||
@@ -20,8 +20,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
|
||||
|
||||
/* I2C */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
|
||||
@@ -22,8 +22,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 3360 /* timeout in ms, max is 3.36 sec */
|
||||
|
||||
/* I2C */
|
||||
|
||||
#ifdef CONFIG_MCFFEC
|
||||
|
||||
@@ -69,16 +69,6 @@
|
||||
#define CFG_SYS_UART_PORT (2)
|
||||
#define CFG_SYS_UART2_ALT3_GPIO
|
||||
|
||||
/*
|
||||
* Watchdog configuration; Watchdog is disabled for running from RAM
|
||||
* and set to highest possible value else. Beware there is no check
|
||||
* in the watchdog code to validate the timeout value set here!
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_MONITOR_IS_IN_RAM
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 3355 /* timeout in milliseconds */
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Configuration for environment
|
||||
* Environment is located in the last sector of the flash
|
||||
|
||||
@@ -42,18 +42,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
/* ---
|
||||
* set "#if 0" to "#if 1" if (Hardware)-WATCHDOG should be enabled & change
|
||||
* timeout acc. to your needs
|
||||
* #define CONFIG_WATCHDOG_TIMEOUT x , x is timeout in milliseconds, e. g. 10000
|
||||
* for 10 sec
|
||||
* ---
|
||||
*/
|
||||
|
||||
#if 0
|
||||
#define CONFIG_WATCHDOG_TIMEOUT 10000 /* timeout in milliseconds */
|
||||
#endif
|
||||
|
||||
/* ---
|
||||
* CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different
|
||||
* bootloader residing in flash ('chainloading'); if you want to use
|
||||
|
||||
Reference in New Issue
Block a user