[U-Boot] [PATCH 1/3] NETTA2: remove empty CONFIG_SHOW_ACTIVITY functions
Signed-off-by: Wolfgang Denk wd@denx.de --- board/netta2/netta2.c | 14 -------------- include/configs/NETTA2.h | 1 - 2 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/board/netta2/netta2.c b/board/netta2/netta2.c index a97c14c..1dbdde1 100644 --- a/board/netta2/netta2.c +++ b/board/netta2/netta2.c @@ -620,20 +620,6 @@ void hw_watchdog_reset(void)
#endif
-#ifdef CONFIG_SHOW_ACTIVITY - -/* called from timer interrupt every 1/CFG_HZ sec */ -void board_show_activity(ulong timestamp) -{ -} - -/* called when looping */ -void show_activity(int arg) -{ -} - -#endif - #if defined(CFG_CONSOLE_IS_IN_ENV) && defined(CFG_CONSOLE_OVERWRITE_ROUTINE) int overwrite_console(void) { diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index 9a1f1d6..ea5d160 100644 --- a/include/configs/NETTA2.h +++ b/include/configs/NETTA2.h @@ -745,7 +745,6 @@ typedef unsigned int led_id_t; /* use board specific hardware */ #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_HW_WATCHDOG -#define CONFIG_SHOW_ACTIVITY
/*************************************************************************************************/
Signed-off-by: Wolfgang Denk wd@denx.de --- board/stxxtc/stxxtc.c | 14 -------------- include/configs/stxxtc.h | 1 - 2 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/board/stxxtc/stxxtc.c b/board/stxxtc/stxxtc.c index a750374..4bb2d68 100644 --- a/board/stxxtc/stxxtc.c +++ b/board/stxxtc/stxxtc.c @@ -599,20 +599,6 @@ void hw_watchdog_reset(void)
#endif
-#ifdef CONFIG_SHOW_ACTIVITY - -/* called from timer interrupt every 1/CFG_HZ sec */ -void board_show_activity(ulong timestamp) -{ -} - -/* called when looping */ -void show_activity(int arg) -{ -} - -#endif - #if defined(CFG_CONSOLE_IS_IN_ENV) && defined(CFG_CONSOLE_OVERWRITE_ROUTINE) int overwrite_console(void) { diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index 37a52cf..0dc9f8a 100644 --- a/include/configs/stxxtc.h +++ b/include/configs/stxxtc.h @@ -580,7 +580,6 @@ typedef unsigned int led_id_t; /* use board specific hardware */ #undef CONFIG_WATCHDOG /* watchdog disabled */ #define CONFIG_HW_WATCHDOG -#define CONFIG_SHOW_ACTIVITY
/*****************************************************************************/
This allows to use show_activity() without having to define an empty board_show_activity() function.
Signed-off-by: Wolfgang Denk wd@denx.de --- lib_ppc/interrupts.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lib_ppc/interrupts.c b/lib_ppc/interrupts.c index b803952..c5951e9 100644 --- a/lib_ppc/interrupts.c +++ b/lib_ppc/interrupts.c @@ -32,7 +32,12 @@ #endif
#ifdef CONFIG_SHOW_ACTIVITY - extern void board_show_activity (ulong); +void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity"))); + +void __board_show_activity (ulong dummy) +{ + return; +} #endif /* CONFIG_SHOW_ACTIVITY */
#ifndef CFG_WATCHDOG_FREQ
participants (1)
-
Wolfgang Denk