The CONFIG_HW_WATCHDOG declaration has been converted to Kconfig
Signed-off-by: Lukasz Majewski lukma@denx.de
---
configs/axm_defconfig | 1 + configs/calimain_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/taurus_defconfig | 1 + configs/ts4800_defconfig | 1 + include/configs/M5475EVB.h | 1 - include/configs/M5485EVB.h | 1 - include/configs/calimain.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/eb_cpu5282.h | 2 -- include/configs/microblaze-generic.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/picosam9g45.h | 1 - include/configs/smartweb.h | 3 --- include/configs/taurus.h | 1 - include/configs/ts4800.h | 2 -- 19 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/configs/axm_defconfig b/configs/axm_defconfig index a08c62ff34..8c01a5c101 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -39,3 +39,4 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y CONFIG_USE_TINY_PRINTF=y +CONFIG_HW_WATCHDOG=y diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig index d8ab012211..0f9bc9ed32 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -23,3 +23,4 @@ CONFIG_ENV_IS_IN_FLASH=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_HW_WATCHDOG=y diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index ca68a81a5b..b12bf30785 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -58,3 +58,4 @@ CONFIG_XILINX_AXIEMAC=y CONFIG_XILINX_EMACLITE=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y +CONFIG_HW_WATCHDOG=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 7b6e6ce730..f294e24f1b 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -33,3 +33,4 @@ CONFIG_TWL4030_USB=y CONFIG_VIDEO=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set +CONFIG_HW_WATCHDOG=y diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index 873776d1ad..70aed83f81 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -37,3 +37,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y +CONFIG_HW_WATCHDOG=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 246003fbfc..28bd3acc45 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -54,3 +54,4 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y # CONFIG_EFI_LOADER is not set +CONFIG_HW_WATCHDOG=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 1f47241021..e7e26adf9e 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -56,3 +56,4 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0908 CONFIG_USB_GADGET_PRODUCT_NUM=0x02d2 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_TINY_PRINTF=y +CONFIG_HW_WATCHDOG=y diff --git a/configs/ts4800_defconfig b/configs/ts4800_defconfig index 17497ca52f..8007f9565a 100644 --- a/configs/ts4800_defconfig +++ b/configs/ts4800_defconfig @@ -15,3 +15,4 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_PHYLIB=y CONFIG_OF_LIBFDT=y +CONFIG_HW_WATCHDOG=y diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 3da7e2a410..e8d2b3aacd 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0)
-#undef CONFIG_HW_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
#define CONFIG_SLTTMR diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 2b26f0fe85..f428a20d82 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -22,7 +22,6 @@ #define CONFIG_MCFUART #define CONFIG_SYS_UART_PORT (0)
-#undef CONFIG_HW_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT 5000 /* timeout in milliseconds, max timeout is 6.71sec */
#define CONFIG_SLTTMR diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 4c2f6ba2d5..524d784811 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -29,7 +29,6 @@ #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_ARCH_CPU_INIT #define CONFIG_DA8XX_GPIO -#define CONFIG_HW_WATCHDOG #define CONFIG_SYS_WDTTIMERBASE DAVINCI_TIMER1_BASE #define CONFIG_SYS_WDT_PERIOD_LOW \ (60 * CONFIG_SYS_OSCIN_FREQ) /* 60 s heartbeat */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 4312ddd4fc..9eafcd01ab 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -339,7 +339,6 @@ /* * Miscellaneous configurable options */ -#define CONFIG_HW_WATCHDOG #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 17c7fa757e..470b2095f8 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -32,8 +32,6 @@ #define CONFIG_RESET_TO_RETRY #define CONFIG_SPLASH_SCREEN
-#define CONFIG_HW_WATCHDOG - #define STATUS_LED_ACTIVE 0
/*----------------------------------------------------------------------* diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 16481cb7ce..254558045c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -50,7 +50,6 @@ # define CONFIG_WATCHDOG_BASEADDR XILINX_WATCHDOG_BASEADDR # define CONFIG_WATCHDOG_IRQ XILINX_WATCHDOG_IRQ # ifndef CONFIG_SPL_BUILD -# define CONFIG_HW_WATCHDOG # define CONFIG_XILINX_TB_WATCHDOG # endif #endif diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 6312ed737c..1b44ad7451 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -159,7 +159,6 @@ #endif
/* Watchdog support */ -#define CONFIG_HW_WATCHDOG
/* * Framebuffer diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index dc7a67d77c..c8807fb754 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -67,7 +67,6 @@
/* Enable the watchdog */ #define CONFIG_AT91SAM9_WATCHDOG -#define CONFIG_HW_WATCHDOG
/* * Command line configuration. diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 49c838bf72..5bbf4c28f6 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -125,9 +125,6 @@
/* Enable the watchdog */ #define CONFIG_AT91SAM9_WATCHDOG -#if !defined(CONFIG_SPL_BUILD) -#define CONFIG_HW_WATCHDOG -#endif #define CONFIG_AT91_HW_WDT_TIMEOUT 15
#if !defined(CONFIG_SPL_BUILD) diff --git a/include/configs/taurus.h b/include/configs/taurus.h index ce06f7bb5f..04d8e8d433 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -94,7 +94,6 @@ #define CONFIG_AT91_HW_WDT_TIMEOUT 15 #if !defined(CONFIG_SPL_BUILD) /* Enable the watchdog */ -#define CONFIG_HW_WATCHDOG #endif
/* USB */ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index ebfbb66bab..e459c776a7 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -17,8 +17,6 @@
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */
-#define CONFIG_HW_WATCHDOG - #define CONFIG_MACH_TYPE MACH_TYPE_TS48XX
/* text base address used when linking */