summaryrefslogtreecommitdiffstats
path: root/board/Marvell
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2015-04-25 06:29:52 +0200
committerLuka Perkov <luka.perkov@sartura.hr>2015-05-05 14:31:49 +0200
commitcae9008f69ab07b6faf75ebd0167ef06b8ebaf99 (patch)
tree64ab9edc376146b81ecbba940cc47b5f4b94ba79 /board/Marvell
parent9c6d3b7b666b949a5015146a6539b468fbbf451f (diff)
downloadblackbird-obmc-uboot-cae9008f69ab07b6faf75ebd0167ef06b8ebaf99.tar.gz
blackbird-obmc-uboot-cae9008f69ab07b6faf75ebd0167ef06b8ebaf99.zip
arm: mvebu: Change network init code to allow a more flexible setup
With the introduction of the Armada 38x support, its necessary to change the mvneta ethernet driver init call from always 4 times to a configurable value. Lets make this init call more flexible by moving the actually used devices to the config header. Additionally this patch takes care of the slightly different base addresses for the ethernet controllers on A38x. Signed-off-by: Stefan Roese <sr@denx.de> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com> Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'board/Marvell')
-rw-r--r--board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
index b3dae8910d..00ca878873 100644
--- a/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
+++ b/board/Marvell/db-mv784mp-gp/db-mv784mp-gp.c
@@ -86,7 +86,8 @@ int checkboard(void)
/* Configure and enable MV88E1545 PHY */
void reset_phy(void)
{
- u16 devadr = CONFIG_PHY_BASE_ADDR;
+ u8 phy_addr[] = CONFIG_PHY_ADDR;
+ u16 devadr = phy_addr[0];
char *name = "neta0";
u16 reg;
OpenPOWER on IntegriCloud