Merge with /home/tur/git/u-boot#cm5200-si

2007-08-07 17:04:30 +02:00
parent bf1060ea4f 86b116b1b1
commit b23b547597
13 changed files with 664 additions and 263 deletions
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@ -890,7 +890,7 @@ int mpc5xxx_fec_initialize(bd_t * bis)
 	fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
 	fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
 #if defined(CONFIG_CANMB)		|| \
-	defined(CONFIG_CM1_QP1)		|| \
+	defined(CONFIG_CM5200)		|| \
 	defined(CONFIG_HMI1001)		|| \
 	defined(CONFIG_ICECUBE)		|| \
 	defined(CONFIG_INKA4X0)		|| \