Finish converting CONFIG_WATCHDOG, HW_WATCHDOG and WDT to Kconfig

Because of how these symbols work, and the remaining board config.h file
uses, we need to do these at the same time.  In some cases we just get
to move rather directly to the defconfigs.  A few cases require manual
intervention.

For the case of the eb_cpu5282 we need to select HW_WATCHDOG for the
target, given how it's implemented.

For the cases of m53menlo, dh_imx6, display5, and display5_factory we
disable SPL watchdog support as the particular combination of options
they want would require either more symbols or enabling SPL_DM.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index fa56061..9935666 100644 (file)
--- a/README
+++ b/README
@@ -639,20 +639,6 @@ The following options need to be configured:
                example "env grep" and "setexpr".
 
 - Watchdog:
-               CONFIG_WATCHDOG
-               If this variable is defined, it enables watchdog
-               support for the SoC. There must be support in the SoC
-               specific code for a watchdog. For the 8xx
-               CPUs, the SIU Watchdog feature is enabled in the SYPCR
-               register.  When supported for a specific SoC is
-               available, then no further board specific code should
-               be needed to use it.
-
-               CONFIG_HW_WATCHDOG
-               When using a watchdog circuitry external to the used
-               SoC, then define this variable and provide board
-               specific code for the "hw_watchdog_reset" function.
-
                CONFIG_SYS_WATCHDOG_FREQ
                Some platforms automatically call WATCHDOG_RESET()
                from the timer interrupt handler every

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 1ab37cc..97c0b7b 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -128,6 +128,7 @@ config TARGET_COBRA5272
 config TARGET_EB_CPU5282
        bool "Support eb_cpu5282"
        select M5282
+       select HW_WATCHDOG
 
 config TARGET_M5208EVBE
        bool "Support M5208EVBE"

diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index d5fe336..5c1af1a 100644 (file)
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -327,8 +327,10 @@ void board_init_f(ulong dummy)
        displ5_set_iomux_misc_spl();
 
        /* Initialize and reset WDT in SPL */
+#ifdef CONFIG_SPL_WATCHDOG
        hw_watchdog_init();
        WATCHDOG_RESET();
+#endif
 
        /* load/boot image from boot device */
        board_init_r(NULL, 0);

diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index d26628a..a97c4ff 100644 (file)
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -40,3 +40,4 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_SYS_FLASH_PROTECTION=y
 CONFIG_SYS_FLASH_CFI=y
 CONFIG_MCFUART=y
+CONFIG_WATCHDOG=y

diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 1f63bc8..d62bd96 100644 (file)
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -37,7 +37,6 @@ CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x11400
-CONFIG_SPL_WATCHDOG=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_UNZIP=y
 CONFIG_CMD_DFU=y

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 145b28e..26af4a6 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -45,7 +45,6 @@ CONFIG_SPL_I2C=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
-CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="display5 > "
 CONFIG_CMD_BOOTZ=y

diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index e0b36f4..218a33d 100644 (file)
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -43,7 +43,6 @@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 CONFIG_SPL_USB_HOST=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
-CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="display5 factory > "
 CONFIG_CMD_BOOTZ=y

diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index 4f77fd7..006c80c 100644 (file)
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -199,4 +199,5 @@ CONFIG_TSEC_ENET=y
 # CONFIG_PCI is not set
 CONFIG_RTC_PCF8563=y
 CONFIG_SYS_NS16550=y
+CONFIG_WATCHDOG=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index 2e51050..ac5afe6 100644 (file)
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -36,7 +36,6 @@ CONFIG_PREBOOT="run try_bootscript"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_NAND_SUPPORT=y
-CONFIG_SPL_WATCHDOG=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 6a69ac4..717e3e4 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -15,7 +15,6 @@
  */
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
 #ifdef CONFIG_MCFFEC

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 7421f3b..2e5220f 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
 /*

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 7ee0ec6..00892ec 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -21,8 +21,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef  CONFIG_WATCHDOG
-
 #undef CONFIG_MONITOR_IS_IN_RAM                /* no pre-loader required!!! ;-) */
 
 /*

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index e9a7922..ff29096 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -12,8 +12,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG         /* disable watchdog */
-
 
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 2121b29..e814a29 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT 10000  /* timeout in milliseconds */
 
 #undef CONFIG_MONITOR_IS_IN_RAM        /* define if monitor is started from a pre-loader */

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 7b33677..58b75b2 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT                5000
 
 #define CONFIG_SYS_UNIFY_CACHE

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 19d8cfe..f172db0 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -20,7 +20,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        5000    /* timeout in milliseconds, max timeout is 6.71sec */
 
 #define CONFIG_SYS_UNIFY_CACHE

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index e2ddc48..ddcd752 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -22,7 +22,6 @@
 
 #define CONFIG_SYS_UART_PORT           (0)
 
-#undef CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT        3360    /* timeout in ms, max is 3.36 sec */
 
 #define CONFIG_SYS_UNIFY_CACHE

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 9aeab70..9a34e54 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -302,8 +302,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#undef CONFIG_WATCHDOG         /* watchdog disabled */
-
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC_PIN_MUX
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index ab029aa..bedb12b 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -266,8 +266,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#undef CONFIG_WATCHDOG                 /* watchdog disabled */
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 349b486..abf3b51 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -384,8 +384,6 @@ extern unsigned long get_clock_freq(void);
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#undef CONFIG_WATCHDOG                 /* watchdog disabled */
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 2167dcd..d66acd1 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -253,8 +253,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#undef CONFIG_WATCHDOG                 /* watchdog disabled */
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index e09b9a4..297246a 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -595,8 +595,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_LOADS_ECHO              /* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change */
 
-#undef CONFIG_WATCHDOG                 /* watchdog disabled */
-
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI_HCD) \
                 || defined(CONFIG_FSL_SATA)
 #endif

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 2e7927b..1af3438 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -91,7 +91,6 @@
  */
 
 #ifndef CONFIG_MONITOR_IS_IN_RAM
-#define CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT 3355   /* timeout in milliseconds */
 #endif
 

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index be62caa..3e19e99 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -54,7 +54,6 @@
  */
 
 #if 0
-#define CONFIG_WATCHDOG
 #define CONFIG_WATCHDOG_TIMEOUT 10000  /* timeout in milliseconds */
 #endif
 

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 3233bf1..8b8cd4c 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -64,13 +64,6 @@
 #endif
 #endif
 
-/* Watchdog */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WDT
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "console=ttymxc0,115200\0"      \

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 8633efb..38ac869 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -314,13 +314,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* Watchdog */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WDT
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
 /* ENV config */
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 6a32bc6..bf1cfc3 100644 (file)
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -25,8 +25,6 @@
 #define CONFIG_BOOT_RETRY_TIME -1
 #define CONFIG_RESET_TO_RETRY
 
-#define CONFIG_HW_WATCHDOG
-
 #define STATUS_LED_ACTIVE              0
 
 /*----------------------------------------------------------------------*

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 49f5d68..c88c72d 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -153,7 +153,6 @@
 /*
  * HW-Watchdog
  */
-#define CONFIG_WATCHDOG                1
 #define CONFIG_SYS_WATCHDOG_VALUE      0xFFFF
 
 /*

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 2844553..124aab0 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -204,9 +204,4 @@
                "fi ; "                                                 \
                "fi\0"
 
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
 #endif /* __M53MENLO_CONFIG_H__ */

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index a2958e7..b31e11d 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -545,8 +545,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif
 
-#undef CONFIG_WATCHDOG /* watchdog disabled */
-
 /*
  * Miscellaneous configurable options
  */

diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h
index aa2c032..928582a 100644 (file)
--- a/include/configs/socfpga_soc64_common.h
+++ b/include/configs/socfpga_soc64_common.h
@@ -147,7 +147,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  * L4 Watchdog
  */
 #ifndef CONFIG_SPL_BUILD
-#undef CONFIG_HW_WATCHDOG
 #undef CONFIG_DESIGNWARE_WATCHDOG
 #endif
 #define CONFIG_DW_WDT_BASE             SOCFPGA_L4WD0_ADDRESS

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index b7296da..5052c72 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -181,8 +181,6 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#undef CONFIG_WATCHDOG                 /* watchdog disabled            */
-
 /*
  * Miscellaneous configurable options
  */