Skip to contentSkip to conversation

NETTA2: remove empty CONFIG_SHOW_ACTIVITY functions

PATCH New Wolfgang Denk 1 participant 3 messages Sep 9, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 NETTA2: remove empty CONFIG_SHOW_ACTIVITY functions

---
 board/netta2/netta2.c    |   14 --------------
 include/configs/NETTA2.h |    1 -
 2 files changed, 0 insertions(+), 15 deletions(-)
board/netta2/netta2.c +0 -14
index a97c14c..1dbdde1 100644
@@ -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)
 {
include/configs/NETTA2.h +0 -1
index 9a1f1d6..ea5d160 100644
@@ -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
 
 /*************************************************************************************************/
 
Signature · 1 line
1.5.6.1
#1 lore raw

PATCH 2/3 stxxtc: remove empty CONFIG_SHOW_ACTIVITY functions

---
 board/stxxtc/stxxtc.c    |   14 --------------
 include/configs/stxxtc.h |    1 -
 2 files changed, 0 insertions(+), 15 deletions(-)
board/stxxtc/stxxtc.c +0 -14
index a750374..4bb2d68 100644
@@ -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)
 {
include/configs/stxxtc.h +0 -1
index 37a52cf..0dc9f8a 100644
@@ -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
 
 /*****************************************************************************/
 
Signature · 1 line
1.5.6.1
#2 lore raw

PATCH 3/3 lib_ppc/interrupts.c: make board_show_activity() a weak function

This allows to use show_activity() without having to define an empty board_show_activity() function.

---
 lib_ppc/interrupts.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
lib_ppc/interrupts.c +6 -1
index b803952..c5951e9 100644
@@ -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
Signature · 1 line
1.5.6.1