From 109c0e3ad32428dd65ed89f882faf59e30132494 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 23 Mar 2004 21:43:07 +0000
Subject: * Patch by Phillippe Robin, 16 Mar 2004:   avoid dereferencing NULL
 pointer in lib_arm/armlinux.c

* Patch by Stephen Williams, 15 Mar 2004:
  Fix CONFIG_SERIAL_SOFTWARE_FIFO documentation

* Patch by Tolunay Orkun, 15 Mar 2004:
  Initialize bi_opbfreq to real OPB frequency via get_OPB_freq()

* Patch by Travis Sawyer, 15 Mar 2004:
  Update CREDITS & MAINTAINERS files for PPC440GX & Ocotea port
---
 cpu/arm926ejs/interrupts.c | 1 -
 cpu/mpc5xxx/fec.c          | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'cpu')

diff --git a/cpu/arm926ejs/interrupts.c b/cpu/arm926ejs/interrupts.c
index 3770660..4fdac9f 100644
--- a/cpu/arm926ejs/interrupts.c
+++ b/cpu/arm926ejs/interrupts.c
@@ -211,7 +211,6 @@ int interrupt_init (void)
 	*(volatile ulong *)(CFG_TIMERBASE + 0) = CFG_TIMER_RELOAD;	/* TimerLoad */
 	*(volatile ulong *)(CFG_TIMERBASE + 4) = CFG_TIMER_RELOAD;	/* TimerValue */
 	*(volatile ulong *)(CFG_TIMERBASE + 8) = 0x8C;
-	/* *(volatile ulong *)(CFG_TIMERBASE + 8) = CFG_TIMER_CTRL | 0x40;  Periodic */
 #endif	/* CONFIG_VERSATILE */
 
 	/* init the timestamp and lastdec value */
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c
index 50499e2..6e20faa 100644
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@ -830,8 +830,8 @@ int mpc5xxx_fec_initialize(bd_t * bis)
 	fec->eth = (ethernet_regs *)MPC5XXX_FEC;
 	fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
 	fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
-#if defined(CONFIG_ICECUBE) ||
-    defined(CONFIG_PM520)   ||
+#if defined(CONFIG_ICECUBE) || \
+    defined(CONFIG_PM520)   || \
     defined(CONFIG_TOP5200)
 # ifndef CONFIG_FEC_10MBIT
 	fec->xcv_type = MII100;
-- 
cgit v1.1