From: Julian Pidancet julian.pidancet@citrix.com
This patch adds proper initialization code for the two PHYs present on the board.
Signed-off-by: Julian Pidancet julian.pidancet@citrix.com
create mode 100644 include/configs/openrd_ultimate.h
diff --git a/MAKEALL b/MAKEALL index ddf4a70..4b6da98 100755 --- a/MAKEALL +++ b/MAKEALL @@ -362,6 +362,7 @@ LIST_ARM9=" \ omap730p2 \ openrd_base \ openrd_client \ + openrd_ultimate \ rd6281a \ sbc2410x \ scb9328 \ diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index fded3f0..d1b2554 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -147,7 +147,7 @@ void mv_phy_init(char *name) /* reset the phy */ miiphy_reset(name, devadr);
- printf("88E1116 Initialized on %s\n", name); + printf(PHY_NO" Initialized on %s\n", name); }
void reset_phy(void) @@ -162,6 +162,8 @@ void reset_phy(void)
/* configure and initialize both PHY's */ mv_phy_init("egiga1"); +#elif (MACH_TYPE_OPENRD == MACH_TYPE_OPENRD_ULTIMATE) + mv_phy_init("egiga1"); #endif } #endif /* CONFIG_RESET_PHY_R */ diff --git a/boards.cfg b/boards.cfg index 5f5d2bf..513aa04 100644 --- a/boards.cfg +++ b/boards.cfg @@ -98,6 +98,7 @@ guruplug arm arm926ejs - Marvell mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood openrd_base arm arm926ejs openrd Marvell kirkwood openrd_client arm arm926ejs openrd Marvell kirkwood +openrd_ultimate arm arm926ejs openrd Marvell kirkwood rd6281a arm arm926ejs - Marvell kirkwood sheevaplug arm arm926ejs - Marvell kirkwood dockstar arm arm926ejs - Seagate kirkwood diff --git a/include/configs/openrd_ultimate.h b/include/configs/openrd_ultimate.h new file mode 100644 index 0000000..b616d6a --- /dev/null +++ b/include/configs/openrd_ultimate.h @@ -0,0 +1,44 @@ +/* + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _CONFIG_OPENRD_ULTIMATE_H +#define _CONFIG_OPENRD_ULTIMATE_H + +#include <configs/openrd.h> + +/* + * Version number information + */ +#define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" + +/* Machine type */ +#define MACH_TYPE_OPENRD MACH_TYPE_OPENRD_ULTIMATE + +/* + * Ethernet Driver configuration + */ +#ifdef CONFIG_CMD_NET +/* enable both ports */ +#define CONFIG_MVGBE_PORTS {1, 1} +#define CONFIG_PHY_BASE_ADR 0x0 +#define PHY_NO "88E1121" +#endif /* CONFIG_CMD_NET */ + +#endif /* _CONFIG_OPENRD_ULTIMATE_H */