This feature is not enabled by any board. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
arch/powerpc/lib/interrupts.c | 13 ------------- common/cli_readline.c | 6 ------ drivers/timer/mpc83xx_timer.c | 4 ---- include/common.h | 4 ---- net/net.c | 3 --- scripts/config_whitelist.txt | 1 - 6 files changed, 31 deletions(-)
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index 19682cfcfa..e589933f56 100644 --- 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 99b631720e..ea510ed639 100644 --- 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 8e541109d4..9bc32f9b28 100644 --- 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 16c885dd3f..4b84969ad3 100644 --- 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 ded86e7456..0513444eb7 100644 --- 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 bbc1cb1033..b5a48f2467 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1573,7 +1573,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