projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: highbank: Add boot counter support
[oweals/u-boot.git]
/
include
/
watchdog.h
diff --git
a/include/watchdog.h
b/include/watchdog.h
index 9265be9737245d7a1e8468c398aef12d07945bad..b9599143afdb4cb701eb98d3f57d3971d9129f30 100644
(file)
--- a/
include/watchdog.h
+++ b/
include/watchdog.h
@@
-31,10
+31,6
@@
# error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
#endif
# error "Configuration error: CONFIG_HW_WATCHDOG and CONFIG_WATCHDOG can't be used together."
#endif
-#if defined(__ASSEMBLY__) && defined(__NIOS__)
-# error "Configuration error: WATCHDOG_RESET inside assembler not supported for Nios platforms."
-#endif
-
/*
* Hardware watchdog
*/
/*
* Hardware watchdog
*/
@@
-84,6
+80,11
@@
void reset_5xx_watchdog(volatile immap_t *immr);
#endif
void reset_5xx_watchdog(volatile immap_t *immr);
#endif
+/* MPC 5xxx */
+#if defined(CONFIG_MPC5xxx) && !defined(__ASSEMBLY__)
+ void reset_5xxx_watchdog(void);
+#endif
+
/* AMCC 4xx */
#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
void reset_4xx_watchdog(void);
/* AMCC 4xx */
#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
void reset_4xx_watchdog(void);