diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-10 20:50:15 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 11:46:50 +0100 |
commit | fc726402479efc486bbd3fb207e8d21ed0f4581c (patch) | |
tree | 152871c3d73ccdad9368f77a962ddf902a2e0fa5 | |
parent | 1aba5d366ccc1016c3c5ca8b10b10eca26c75db9 (diff) | |
download | barebox-fc726402479efc486bbd3fb207e8d21ed0f4581c.tar.gz barebox-fc726402479efc486bbd3fb207e8d21ed0f4581c.tar.xz |
remove unused watchdog header
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | arch/ppc/lib/board.c | 1 | ||||
-rw-r--r-- | arch/ppc/lib/ppclinux.c | 1 | ||||
-rw-r--r-- | arch/ppc/lib/ticks.S | 1 | ||||
-rw-r--r-- | commands/bootm.c | 1 | ||||
-rw-r--r-- | include/watchdog.h | 92 | ||||
-rw-r--r-- | lib/readline_simple.c | 1 | ||||
-rw-r--r-- | net/net.c | 1 |
7 files changed, 0 insertions, 98 deletions
diff --git a/arch/ppc/lib/board.c b/arch/ppc/lib/board.c index 0e839eb053..a840c75204 100644 --- a/arch/ppc/lib/board.c +++ b/arch/ppc/lib/board.c @@ -23,7 +23,6 @@ #include <debug_ll.h> #include <common.h> -#include <watchdog.h> #include <command.h> #include <malloc.h> #include <memory.h> diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c index 471b3037fe..025fd27fd7 100644 --- a/arch/ppc/lib/ppclinux.c +++ b/arch/ppc/lib/ppclinux.c @@ -2,7 +2,6 @@ #include <common.h> #include <command.h> -#include <watchdog.h> #include <image.h> #include <init.h> #include <environment.h> diff --git a/arch/ppc/lib/ticks.S b/arch/ppc/lib/ticks.S index 5d6c4277af..453d889213 100644 --- a/arch/ppc/lib/ticks.S +++ b/arch/ppc/lib/ticks.S @@ -26,7 +26,6 @@ #include <asm/ppc_asm.tmpl> #include <asm/ppc_defs.h> #include <config.h> -#include <watchdog.h> /* * unsigned long long get_ticks(void); diff --git a/commands/bootm.c b/commands/bootm.c index f97a842232..453ae543a8 100644 --- a/commands/bootm.c +++ b/commands/bootm.c @@ -25,7 +25,6 @@ * Boot support */ #include <common.h> -#include <watchdog.h> #include <driver.h> #include <command.h> #include <image.h> diff --git a/include/watchdog.h b/include/watchdog.h deleted file mode 100644 index 9265be9737..0000000000 --- a/include/watchdog.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * (C) Copyright 2001 - * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -/* - * Watchdog functions and macros. - */ -#ifndef _WATCHDOG_H_ -#define _WATCHDOG_H_ - -#if defined(CONFIG_HW_WATCHDOG) && defined(CONFIG_WATCHDOG) -# 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 - */ -#ifdef CONFIG_HW_WATCHDOG - #if defined(__ASSEMBLY__) - #define WATCHDOG_RESET bl hw_watchdog_reset - #else - extern void hw_watchdog_reset(void); - - #define WATCHDOG_RESET hw_watchdog_reset - #endif /* __ASSEMBLY__ */ -#else - /* - * Maybe a software watchdog? - */ - #if defined(CONFIG_WATCHDOG) - #if defined(__ASSEMBLY__) - #define WATCHDOG_RESET bl watchdog_reset - #else - extern void watchdog_reset(void); - - #define WATCHDOG_RESET watchdog_reset - #endif - #else - /* - * No hardware or software watchdog. - */ - #if defined(__ASSEMBLY__) - #define WATCHDOG_RESET /*XXX DO_NOT_DEL_THIS_COMMENT*/ - #else - #define WATCHDOG_RESET() {} - #endif /* __ASSEMBLY__ */ - #endif /* CONFIG_WATCHDOG && !__ASSEMBLY__ */ -#endif /* CONFIG_HW_WATCHDOG */ - -/* - * Prototypes from $(CPU)/cpu.c. - */ - -/* MPC 8xx */ -#if (defined(CONFIG_8xx) || defined(CONFIG_MPC860)) && !defined(__ASSEMBLY__) - void reset_8xx_watchdog(volatile immap_t *immr); -#endif - -/* MPC 5xx */ -#if defined(CONFIG_5xx) && !defined(__ASSEMBLY__) - void reset_5xx_watchdog(volatile immap_t *immr); -#endif - -/* AMCC 4xx */ -#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__) - void reset_4xx_watchdog(void); -#endif - -#endif /* _WATCHDOG_H_ */ diff --git a/lib/readline_simple.c b/lib/readline_simple.c index 9dd21545e2..982e50e975 100644 --- a/lib/readline_simple.c +++ b/lib/readline_simple.c @@ -1,5 +1,4 @@ #include <common.h> -#include <watchdog.h> static char erase_seq[] = "\b \b"; /* erase sequence */ static char tab_seq[] = " "; /* used to expand TABs */ @@ -28,7 +28,6 @@ */ #include <common.h> #include <clock.h> -#include <watchdog.h> #include <command.h> #include <environment.h> #include <param.h> |