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>

diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 6d87908965d2f5a1c293f4d6f829f36dcd3afdd5..ba2c2289119a004ca5c3a8322929534abc22d775 100644 (file)
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -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);
 

diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index d21d82fef758cb7c234f4d0ed1d2cdf8dbff604b..d7cbf11e255b7fa76e0ee173fac4ff970401ae96 100644 (file)
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -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);

diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index 8a48d73475c8b10166aa25cc0b13bc57d76ed2e5..548cbca36aa114c0e3e95f9f0f8afa596518e47f 100644 (file)
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -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

diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index fd219cbaebc5f7f4f898a6c164b1221a20f3c1b5..680c2d43671b37ba10410f9eaa1408a13dd60d1e 100644 (file)
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -43,3 +43,4 @@ CONFIG_SYS_MAX_FLASH_SECT=254
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index 1b7b1568003e3665a050f3507430cbd7e8c94502..c0087aa67f95a4616ae615ef7e7c5ebc8085bee5 100644 (file)
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

diff --git a/configs/M5235EVB_defconfig b/configs/M5235EVB_defconfig
index fffcdddd4912c97116713199f43599b78475c047..b099e986067b4b569835f2b5b6da7c726f6b116d 100644 (file)
--- a/configs/M5235EVB_defconfig
+++ b/configs/M5235EVB_defconfig
@@ -50,3 +50,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

diff --git a/configs/M5272C3_defconfig b/configs/M5272C3_defconfig
index 5e7d40144f964c124ca54c2fa27160970ab9d5d6..a321b1c5c244d7d2a21cb9b984741ea78f4621aa 100644 (file)
--- a/configs/M5272C3_defconfig
+++ b/configs/M5272C3_defconfig
@@ -62,3 +62,4 @@ CONFIG_SYS_MAX_FLASH_SECT=137
 CONFIG_MCFFEC=y
 CONFIG_MII=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=10000

diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 6586f0468b20862ab63892190e0d42c554218ef4..32d195808801d432de7d41530ff3940f52e7a9c4 100644 (file)
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -49,3 +49,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index bf1d70f832cc7fe1ec534e653ed272526f8dc55c..9f0b4196392be45a001841f68aea4fc4a4e45ef3 100644 (file)
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -48,3 +48,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index b83b542f8f836f7c3e9d17778da878ae7a5af30c..05388796fb11d6f2562e48745ba4aab5ac1e7cee 100644 (file)
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -50,3 +50,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=5000

diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 181f79b1e906d40024ae31c946fa0355f472188e..90d83216489a433595b9099be11a629809bad6ef 100644 (file)
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -50,3 +50,4 @@ CONFIG_MII=y
 CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=3360

diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index afbcb86c034b1be775e40d6c1b07318c43c52cf4..9e5665a12b84b1eacb87548ae059cb6d5edacbcc 100644 (file)
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -50,3 +50,4 @@ CONFIG_MCFRTC=y
 CONFIG_SYS_MCFRTC_BASE=0xFC0A8000
 CONFIG_MCFUART=y
 CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=3355

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 246437a51e2fd709f3a14bd313aa1e552994c82d..b360238b332a91777d617b40a7d1375eb26c9e06 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -15,8 +15,6 @@
  */
 #define CFG_SYS_UART_PORT              (0)
 
-#define CONFIG_WATCHDOG_TIMEOUT                5000
-
 /* I2C */
 
 #ifdef CONFIG_MCFFEC

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 128ef50b476f07da774c255403adb0d179ab9a3d..ed45eccb62c9547d8c664a7cac47ee92199e192a 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -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)

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 847b4c2593d83a86ee08581832033a41fc564c9d..a9339e5052578a197bde4f8fa58a4ea546d7b5ae 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -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

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 0e9ba4c3ada893490163e5a7c8004fd10ed390e8..42b74aeb9b5d03d51ad549cb6df6d48b5a3ad9c3 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -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

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 8f83810f165e395c08a7d48a1729c62ef14f237c..72f0c63a1e21ecfc32ef478f5860da02098a3ea5 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -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

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 43c642edeb1892e01cf660b21160f17275122b68..4e8b54e01f4e257c7fd66f62bd03f3b524b1af53 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -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

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index f5922fc416eb081df7c25ece742018e20a58dd96..62aa99342a0ec1aca87d4ca726011d106451a5f1 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -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

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 01828ea2011c1c2e959d43f2fe4c2a7399acf7d8..6d6e2fc696200f85f91e860441404f17e25ca13d 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -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