summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-07-12 01:42:41 +0200
committerWolfgang Denk <wd@denx.de>2007-07-12 01:42:41 +0200
commitfd3635190bee477dd19b87da80136c00f11444c0 (patch)
treec30f7759355c8bc183f5c6a89ad89fea9a8ae90a /cpu
parent96e1d75be8193ca79e4215a368bf9d7f2362450f (diff)
parentfa1df308926a6f70e3504c57514ef27ac31fd13a (diff)
downloadu-boot-imx-fd3635190bee477dd19b87da80136c00f11444c0.zip
u-boot-imx-fd3635190bee477dd19b87da80136c00f11444c0.tar.gz
u-boot-imx-fd3635190bee477dd19b87da80136c00f11444c0.tar.bz2
Merge with /home/tur/git/u-boot#cm1_qp1
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc5xxx/fec.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c
index 8136366..3d99d5c 100644
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@ -889,13 +889,20 @@ 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_CANMB) || defined(CONFIG_HMI1001) || \
- defined(CONFIG_ICECUBE) || defined(CONFIG_INKA4X0) || \
- defined(CONFIG_JUPITER) || defined(CONFIG_MCC200) || \
- defined(CONFIG_MOTIONPRO)|| defined(CONFIG_O2DNT) || \
- defined(CONFIG_PM520) || defined(CONFIG_TOP5200) || \
- defined(CONFIG_TQM5200) || defined(CONFIG_UC101) || \
- defined(CONFIG_V38B)
+#if defined(CONFIG_CANMB) || \
+ defined(CONFIG_CM1_QP1) || \
+ defined(CONFIG_HMI1001) || \
+ defined(CONFIG_ICECUBE) || \
+ defined(CONFIG_INKA4X0) || \
+ defined(CONFIG_JUPITER) || \
+ defined(CONFIG_MCC200) || \
+ defined(CONFIG_MOTIONPRO) || \
+ defined(CONFIG_O2DNT) || \
+ defined(CONFIG_PM520) || \
+ defined(CONFIG_TOP5200) || \
+ defined(CONFIG_TQM5200) || \
+ defined(CONFIG_UC101) || \
+ defined(CONFIG_V38B)
# ifndef CONFIG_FEC_10MBIT
fec->xcv_type = MII100;
# else