projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
[platform/kernel/u-boot.git]
/
include
/
watchdog.h
diff --git
a/include/watchdog.h
b/include/watchdog.h
index
52f4c50
..
14fa5fd
100644
(file)
--- a/
include/watchdog.h
+++ b/
include/watchdog.h
@@
-1,8
+1,7
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2001
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
/*
* (C) Copyright 2001
* Erik Theisen, Wave 7 Optics, etheisen@mindspring.com.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-52,9
+51,15
@@
int init_func_watchdog_reset(void);
#if defined(__ASSEMBLY__)
#define WATCHDOG_RESET bl watchdog_reset
#else
#if defined(__ASSEMBLY__)
#define WATCHDOG_RESET bl watchdog_reset
#else
- extern void watchdog_reset(void);
+ /* Don't require the watchdog to be enabled in SPL */
+ #if defined(CONFIG_SPL_BUILD) && \
+ !defined(CONFIG_SPL_WATCHDOG)
+ #define WATCHDOG_RESET() {}
+ #else
+ extern void watchdog_reset(void);
- #define WATCHDOG_RESET watchdog_reset
+ #define WATCHDOG_RESET watchdog_reset
+ #endif
#endif
#else
/*
#endif
#else
/*
@@
-72,7
+77,7
@@
int init_func_watchdog_reset(void);
* Prototypes from $(CPU)/cpu.c.
*/
* Prototypes from $(CPU)/cpu.c.
*/
-#if
defined(CONFIG_HW_WATCHDOG
) && !defined(__ASSEMBLY__)
+#if
(defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
) && !defined(__ASSEMBLY__)
void hw_watchdog_init(void);
#endif
void hw_watchdog_init(void);
#endif