summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-11-27 22:50:25 +0100
committerWolfgang Denk <wd@denx.de>2006-11-27 22:50:25 +0100
commit70864e6163c57d6d0722f4dc7242813d8bc21e30 (patch)
treecc0bb7fa841b30ec7c319791b8c13987549331c4
parent7de8354855138b9a5c621272a8278c1051b29738 (diff)
parentf6e495f54cdb8fe340b9c03deab40ad746d52fae (diff)
downloadu-boot-imx-70864e6163c57d6d0722f4dc7242813d8bc21e30.zip
u-boot-imx-70864e6163c57d6d0722f4dc7242813d8bc21e30.tar.gz
u-boot-imx-70864e6163c57d6d0722f4dc7242813d8bc21e30.tar.bz2
Merge with /home/sr/git/u-boot/4xx-enet
-rw-r--r--cpu/ppc4xx/4xx_enet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c
index 81d49ff..aefe126 100644
--- a/cpu/ppc4xx/4xx_enet.c
+++ b/cpu/ppc4xx/4xx_enet.c
@@ -264,10 +264,10 @@ int ppc_4xx_eth_setup_bridge(int devnum, bd_t * bis)
bis->bi_phymode[3] = BI_PHYMODE_ZMII;
break;
case 2:
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(0);
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(1);
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(2);
- zmiifer = ZMII_FER_SMII << ZMII_FER_V(3);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(0);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(1);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(2);
+ zmiifer |= ZMII_FER_SMII << ZMII_FER_V(3);
bis->bi_phymode[0] = BI_PHYMODE_ZMII;
bis->bi_phymode[1] = BI_PHYMODE_ZMII;
bis->bi_phymode[2] = BI_PHYMODE_ZMII;