summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorwdenk <wdenk>2002-11-11 21:14:20 +0000
committerwdenk <wdenk>2002-11-11 21:14:20 +0000
commit1d0350ed0b1b0f63e3fb5db6b19397b84a2ea1c7 (patch)
treec26edf461eb3d49625026f7ec5751f8fee2556d8 /cpu
parenteb9401e3ebfa6a1550522be28895af461137f797 (diff)
downloadu-boot-imx-1d0350ed0b1b0f63e3fb5db6b19397b84a2ea1c7.zip
u-boot-imx-1d0350ed0b1b0f63e3fb5db6b19397b84a2ea1c7.tar.gz
u-boot-imx-1d0350ed0b1b0f63e3fb5db6b19397b84a2ea1c7.tar.bz2
* Patch by Jim Sandoz, 07 Nov 2002:
Increase number of network RX buffers (PKTBUFSRX in "include/net.h") for EEPRO100 based boards (especially SP8240) which showed "Receiver is not ready" errors when U-Boot was processing the receive buffers slower than the network controller was filling them. * Get rid of obsolete include/mpc74xx.h
Diffstat (limited to 'cpu')
-rw-r--r--cpu/74xx_7xx/cache.S2
-rw-r--r--cpu/mpc8260/interrupts.c21
2 files changed, 15 insertions, 8 deletions
diff --git a/cpu/74xx_7xx/cache.S b/cpu/74xx_7xx/cache.S
index f35966c..a793d79 100644
--- a/cpu/74xx_7xx/cache.S
+++ b/cpu/74xx_7xx/cache.S
@@ -1,5 +1,5 @@
#include <config.h>
-#include <mpc74xx.h>
+#include <74xx_7xx.h>
#include <version.h>
#include <ppc_asm.tmpl>
diff --git a/cpu/mpc8260/interrupts.c b/cpu/mpc8260/interrupts.c
index d804408..9062084 100644
--- a/cpu/mpc8260/interrupts.c
+++ b/cpu/mpc8260/interrupts.c
@@ -29,6 +29,9 @@
#include <mpc8260.h>
#include <mpc8260_irq.h>
#include <asm/processor.h>
+#ifdef CONFIG_STATUS_LED
+#include <status_led.h>
+#endif
/****************************************************************************/
@@ -292,7 +295,7 @@ void timer_interrupt (struct pt_regs *regs)
{
#if defined(CONFIG_WATCHDOG) || defined(CFG_HYMOD_DBLEDS)
volatile immap_t *immr = (immap_t *) CFG_IMMR;
-#endif /* CONFIG_WATCHDOG */
+#endif /* CONFIG_WATCHDOG */
/* Restore Decrementer Count */
set_dec (decrementer_count);
@@ -306,19 +309,19 @@ void timer_interrupt (struct pt_regs *regs)
if ((timestamp % CFG_HZ) == 0) {
#if defined(CFG_CMA_LCD_HEARTBEAT)
extern void lcd_heartbeat (void);
-#endif /* CFG_CMA_LCD_HEARTBEAT */
+#endif /* CFG_CMA_LCD_HEARTBEAT */
#if defined(CFG_HYMOD_DBLEDS)
volatile iop8260_t *iop = &immr->im_ioport;
static int shift = 0;
-#endif /* CFG_HYMOD_DBLEDS */
+#endif /* CFG_HYMOD_DBLEDS */
#if defined(CFG_CMA_LCD_HEARTBEAT)
lcd_heartbeat ();
-#endif /* CFG_CMA_LCD_HEARTBEAT */
+#endif /* CFG_CMA_LCD_HEARTBEAT */
#if defined(CONFIG_WATCHDOG)
reset_8260_watchdog (immr);
-#endif /* CONFIG_WATCHDOG */
+#endif /* CONFIG_WATCHDOG */
#if defined(CFG_HYMOD_DBLEDS)
/* hymod daughter board LEDs */
@@ -326,9 +329,13 @@ void timer_interrupt (struct pt_regs *regs)
shift = 0;
iop->iop_pdatd =
(iop->iop_pdatd & ~0x0f000000) | (1 << (24 + shift));
-#endif /* CFG_HYMOD_DBLEDS */
+#endif /* CFG_HYMOD_DBLEDS */
}
-#endif /* CONFIG_WATCHDOG || CFG_CMA_LCD_HEARTBEAT */
+#endif /* CONFIG_WATCHDOG || CFG_CMA_LCD_HEARTBEAT */
+
+#ifdef CONFIG_STATUS_LED
+ status_led_tick (timestamp);
+#endif /* CONFIG_STATUS_LED */
}
/****************************************************************************/