diff options
| -rw-r--r-- | arch/powerpc/lib/interrupts.c | 13 | ||||
| -rw-r--r-- | common/cli_readline.c | 6 | ||||
| -rw-r--r-- | drivers/timer/mpc83xx_timer.c | 4 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | net/net.c | 3 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
6 files changed, 0 insertions, 31 deletions
diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index 19682cf..e589933 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 99b6317..ea510ed 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 8e54110..9bc32f9 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 16c885d..4b84969 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__ */ @@ -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 7784922..f3ed80e 100644 --- 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 |