Drop CONFIG_SHOW_ACTIVITY

This feature is not enabled by any board. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 19682cfcfadeca64d3e1be6d1e2f38b8840c6952..e589933f565695884a25ccc600f349011a625b3b 100644 (file)
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -15,15 +15,6 @@
 #endif
 
 #ifndef CONFIG_MPC83XX_TIMER
-#ifdef CONFIG_SHOW_ACTIVITY
-void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity")));
-
-void __board_show_activity (ulong dummy)
-{
-       return;
-}
-#endif /* CONFIG_SHOW_ACTIVITY */
-
 #ifndef CONFIG_SYS_WATCHDOG_FREQ
 #define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
 #endif
@@ -94,10 +85,6 @@ void timer_interrupt (struct pt_regs *regs)
 #ifdef CONFIG_LED_STATUS
        status_led_tick (timestamp);
 #endif /* CONFIG_LED_STATUS */
-
-#ifdef CONFIG_SHOW_ACTIVITY
-       board_show_activity (timestamp);
-#endif /* CONFIG_SHOW_ACTIVITY */
 }
 
 ulong get_timer (ulong base)

diff --git a/common/cli_readline.c b/common/cli_readline.c
index 99b631720e17b02fdc41f524d7a733b19bb72750..ea510ed63956973638b0af00cc82760905cea0aa 100644 (file)
--- a/common/cli_readline.c
+++ b/common/cli_readline.c
@@ -569,12 +569,6 @@ int cli_readline_into_buffer(const char *const prompt, char *buffer,
                        return -2;      /* timed out */
                WATCHDOG_RESET();       /* Trigger watchdog, if needed */
 
-#ifdef CONFIG_SHOW_ACTIVITY
-               while (!tstc()) {
-                       show_activity(0);
-                       WATCHDOG_RESET();
-               }
-#endif
                c = getc();
 
                /*

diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 8e541109d4eaf69f4624fd93085eed4e1f1d0a70..9bc32f9b281f25f13a4aee2fbe14d0e0d339c10f 100644 (file)
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -171,10 +171,6 @@ void timer_interrupt(struct pt_regs *regs)
 #ifdef CONFIG_LED_STATUS
        status_led_tick(priv->timestamp);
 #endif /* CONFIG_LED_STATUS */
-
-#ifdef CONFIG_SHOW_ACTIVITY
-       board_show_activity(priv->timestamp);
-#endif /* CONFIG_SHOW_ACTIVITY */
 }
 
 void wait_ticks(ulong ticks)

diff --git a/include/common.h b/include/common.h
index 16c885dd3ff00b30f8b572df700897abb823344b..4b84969ad3d27e4ff7b586b17240ae18d5229014 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -351,10 +351,6 @@ static inline struct in_addr env_get_ip(char *var)
 
 #include <bootstage.h>
 
-#ifdef CONFIG_SHOW_ACTIVITY
-void show_activity(int arg);
-#endif
-
 #else  /* __ASSEMBLY__ */
 
 #endif /* __ASSEMBLY__ */

diff --git a/net/net.c b/net/net.c
index ded86e7456715ebfc39ce1f52cdd5fd954870963..0513444eb78fc670d3d24cde8ff94472d13ab467 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -561,9 +561,6 @@ restart:
         */
        for (;;) {
                WATCHDOG_RESET();
-#ifdef CONFIG_SHOW_ACTIVITY
-               show_activity(1);
-#endif
                if (arp_timeout_check() > 0)
                        time_start = get_timer(0);
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7784922693bfcd7c9209e4a832c7d0b7e27d46c6..f3ed80e6c4e350fa85a84cd1187c4308dc067f87 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1567,7 +1567,6 @@ CONFIG_SHARP_LM8V31
 CONFIG_SHARP_LQ035Q7DH06
 CONFIG_SHEEVA_88SV131
 CONFIG_SHEEVA_88SV331xV5
-CONFIG_SHOW_ACTIVITY
 CONFIG_SH_CMT_CLK_FREQ
 CONFIG_SH_DSP
 CONFIG_SH_ETHER_ALIGNE_SIZE