summaryrefslogtreecommitdiffstats
path: root/include/watchdog.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-05-14 18:49:35 -0600
committerTom Rini <trini@konsulko.com>2016-05-27 15:39:54 -0400
commit9be2e790eb28cbb30fb16a939cb95f82ad73efe5 (patch)
tree6ec89affcfe4cb63fcbe8291dc88ab651e78ce23 /include/watchdog.h
parent14c67ebaefec6d477603454aa2998c36da40453b (diff)
downloadblackbird-obmc-uboot-9be2e790eb28cbb30fb16a939cb95f82ad73efe5.tar.gz
blackbird-obmc-uboot-9be2e790eb28cbb30fb16a939cb95f82ad73efe5.zip
Drop use of CONFIG_SYS_GENERIC_BOARD in U-Boot
This option is always enabled and is about to be removed. Drop references to it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
Diffstat (limited to 'include/watchdog.h')
-rw-r--r--include/watchdog.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/watchdog.h b/include/watchdog.h
index 9273fa1e80..174c894e49 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -21,8 +21,7 @@
int init_func_watchdog_reset(void);
#endif
-#if defined(CONFIG_SYS_GENERIC_BOARD) && \
- (defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG))
+#if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
#define INIT_FUNC_WATCHDOG_INIT init_func_watchdog_init,
#define INIT_FUNC_WATCHDOG_RESET init_func_watchdog_reset,
#else
OpenPOWER on IntegriCloud