Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

m68k: Rename CONFIG_WATCHDOG_TIMEOUT to CONFIG_WATCHDOG_TIMEOUT_MSECS

Browse source 
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:
Tom Rini 2022-11-19 18:45:45 -05:00
parent 9cebc4ad8e
commit 7102d324f6
20 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/m68k/cpu/mcf523x/cpu.c
View file

@ -92,7 +92,7 @@ int watchdog_init(void)
u32 wdog_module = 0;
/* set timeout and enable watchdog */
wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT);
wdog_module = ((CFG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT_MSECS);
wdog_module |= (wdog_module / 8192);
out_be16(&wdp->mr, wdog_module);

6
arch/m68k/cpu/mcf52x2/cpu.c
View file

@ -87,7 +87,7 @@ int watchdog_init(void)
/* set timeout and enable watchdog */
out_be16(&wdt->mr,
(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
(CONFIG_WATCHDOG_TIMEOUT_MSECS * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
/* reset watchdog counter */
out_be16(&wdt->sr, 0x5555);
@ -253,7 +253,7 @@ int watchdog_init(void)
/* set timeout and enable watchdog */
out_be16(&wdt->wdog_wrrr,
(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
(CONFIG_WATCHDOG_TIMEOUT_MSECS * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
/* reset watchdog counter */
out_be16(&wdt->wdog_wcr, 0);
@ -323,7 +323,7 @@ int watchdog_init(void)
/* set timeout and enable watchdog */
out_be16(&wdt->wmr,
(CONFIG_WATCHDOG_TIMEOUT * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
(CONFIG_WATCHDOG_TIMEOUT_MSECS * CONFIG_SYS_HZ) / (32768 * 1000) - 1);
/* reset watchdog counter */
out_be16(&wdt->wsr, 0x5555);

2
arch/m68k/cpu/mcf532x/cpu.c
View file

@ -131,7 +131,7 @@ int watchdog_init(void)
u32 wdog_module = 0;
/* set timeout and enable watchdog */
wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
wdog_module = ((CFG_SYS_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT_MSECS);
#ifdef CONFIG_M5329
out_be16(&wdp->mr, wdog_module / 8192);
#else

1
configs/M5208EVBE_defconfig
View file

@ -43,3 +43,4 @@ CONFIG_SYS_MAX_FLASH_SECT=254
CONFIG_MCFFEC=y
CONFIG_MII=y
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

1
configs/M5235EVB_Flash32_defconfig
View file

@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
CONFIG_MCFFEC=y
CONFIG_MII=y
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

1
configs/M5235EVB_defconfig
View file

@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
CONFIG_MCFFEC=y
CONFIG_MII=y
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

1
configs/M5272C3_defconfig
View file

@ -62,3 +62,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
CONFIG_MCFFEC=y
CONFIG_MII=y
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=10000

1
configs/M53017EVB_defconfig
View file

@ -49,3 +49,4 @@ CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

1
configs/M5329AFEE_defconfig
View file

@ -48,3 +48,4 @@ CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

1
configs/M5329BFEE_defconfig
View file

@ -50,3 +50,4 @@ CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

1
configs/M5373EVB_defconfig
View file

@ -50,3 +50,4 @@ CONFIG_MII=y
CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=3360

1
configs/astro_mcf5373l_defconfig
View file

@ -50,3 +50,4 @@ CONFIG_MCFRTC=y
CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
CONFIG_MCFUART=y
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=3355

2
include/configs/M5208EVBE.h
View file

@ -15,8 +15,6 @@
*/
#define CFG_SYS_UART_PORT (0)
#define CONFIG_WATCHDOG_TIMEOUT 5000
/* I2C */
#ifdef CONFIG_MCFFEC

2
include/configs/M5235EVB.h
View file

@ -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)

2
include/configs/M5272C3.h
View file

@ -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

2
include/configs/M53017EVB.h
View file

@ -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

2
include/configs/M5329EVB.h
View file

@ -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

2
include/configs/M5373EVB.h
View file

@ -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

10
include/configs/astro_mcf5373l.h
View file

@ -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

12
include/configs/cobra5272.h
View file

@ -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