Kirkwood: Add support for OpenRD-Client & OpenRD-Ultimate

-----Original Message-----
From: Julian Pidancet [mailto:swaplinker at gmail.com] On Behalf Of julian.pidancet at citrix.com
Sent: Friday, March 25, 2011 2:19 PM
To: u-boot at lists.denx.de
Cc: tanmay.upadhyay at einfochips.com; Prafulla Wadaskar; Julian Pidancet
Subject: [PATCH v2 1/4] Kirkwood: Rename openrd_base board files to openrd.

From: Julian Pidancet <[email protected]>

This patch renames openrd_base to openrd in order to add support for other boards of the OpenRD family in future commits. The openrd_base board name remain in use.

Signed-off-by Julian Pidancet <[email protected]>

 rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
 rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
 rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c}
(97%)
 rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h}
(95%)
 create mode 100644 include/configs/openrd.h

board/Marvell/openrd/Makefile renamed from board/Marvell/openrd_base/Makefile +1 -1

similarity index 98%
rename from board/Marvell/openrd_base/Makefile
rename to board/Marvell/openrd/Makefile
index d6d0ed3..19020e4 100644
@@ -31,7 +31,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= openrd_base.o
+COBJS	:= openrd.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))

board/Marvell/openrd/kwbimage.cfg renamed from board/Marvell/openrd_base/kwbimage.cfg +0 -0

similarity index 100%
rename from board/Marvell/openrd_base/kwbimage.cfg
rename to board/Marvell/openrd/kwbimage.cfg

board/Marvell/openrd/openrd.c renamed from board/Marvell/openrd_base/openrd_base.c +1 -1

similarity index 97%
rename from board/Marvell/openrd_base/openrd_base.c
rename to board/Marvell/openrd/openrd.c
index 10109c1..b395df7 100644
@@ -31,7 +31,7 @@
 #include <miiphy.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/arch/mpp.h>
-#include "openrd_base.h"
+#include "openrd.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 

boards.cfg +0 -0

index 45c3102..07c904b 100644
@@ -96,7 +96,7 @@ davinci_sonata               arm         arm926ejs

sonata davinci
suen3 arm arm926ejs km_arm
keymile kirkwood

guruplug arm arm926ejs -
Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs -
Marvell kirkwood
-openrd_base arm arm926ejs -
Marvell kirkwood
+openrd_base arm arm926ejs openrd
Marvell Kirkwood

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Thursday, April 07, 2011 12:25 AM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; julian.pidancet at citrix.com; Clint Adams
Subject: [PATCH 2/2] Initialize second PHY on OpenRD-Client and OpenRD- Ultimate.

(rework of Julian Pidancet's patch)

---
 board/Marvell/openrd_base/openrd_base.c |   22 ++++++++++++++++++----
 include/configs/openrd_base.h           |   14 ++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

board/Marvell/openrd_base/openrd_base.c +11 -4

index 10109c1..aea4760 100644
@@ -118,12 +118,11 @@ int board_init(void)
 }
 
 #ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
 {
 	u16 reg;
 	u16 devadr;
-	char *name = "egiga0";
 
 	if (miiphy_set_current_dev(name))
 		return;

@@ -148,6 +147,21 @@ void reset_phy(void)
 	/* 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)
+{
+       mv_phy_init("egiga0");
+
+#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+       /* Kirkwood ethernet driver is written with the assumption that

in case
+ * of multiple PHYs, their addresses are consecutive. But
unfortunately
+ * in case of OpenRD-Client, PHY addresses are not
consecutive.*/

board/Marvell/openrd_base/openrd_base.c +5 -0

+       miiphy_write("egiga1", 0xEE, 0xEE, 24);
+
+       /* configure and initialize both PHY's */
+       mv_phy_init("egiga1");
+#endif
 }
 #endif /* CONFIG_RESET_PHY_R */

include/configs/openrd_base.h +4 -2

index 5e05890..aa13908 100644
@@ -117,8 +117,18 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0x8
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+# else
+#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */

Quoted 77 lines

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Thursday, April 07, 2011 12:25 AM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; julian.pidancet at citrix.com; Clint Adams
Subject: [PATCH 2/2] Initialize second PHY on OpenRD-Client and OpenRD- Ultimate.

(rework of Julian Pidancet's patch)

---
  board/Marvell/openrd_base/openrd_base.c |   22 ++++++++++++++++++----
  include/configs/openrd_base.h           |   14 ++++++++++++--
  2 files changed, 30 insertions(+), 6 deletions(-)

board/Marvell/openrd_base/openrd_base.c +11 -4

index 10109c1..aea4760 100644
@@ -118,12 +118,11 @@ int board_init(void)
  }
 
  #ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
  {
  	u16 reg;
  	u16 devadr;
-	char *name = "egiga0";
 
  	if (miiphy_set_current_dev(name))
  		return;

@@ -148,6 +147,21 @@ void reset_phy(void)
  	/* 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)
+{
+       mv_phy_init("egiga0");
+
+#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+       /* Kirkwood ethernet driver is written with the assumption that

in case
+ * of multiple PHYs, their addresses are consecutive. But
unfortunately
+ * in case of OpenRD-Client, PHY addresses are not
consecutive.*/

board/Marvell/openrd_base/openrd_base.c +5 -0

+       miiphy_write("egiga1", 0xEE, 0xEE, 24);
+
+       /* configure and initialize both PHY's */
+       mv_phy_init("egiga1");
+#endif
  }
  #endif /* CONFIG_RESET_PHY_R */

include/configs/openrd_base.h +4 -2

index 5e05890..aa13908 100644
@@ -117,8 +117,18 @@
   * Ethernet Driver configuration
   */
  #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0x8
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+# else
+#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */

include/configs/openrd_base.h line 133

Quoted 10 lines

include/configs/openrd_base.h +8 -0

+# endif
+# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
+#  define CONFIG_PHY_BASE_ADR	0x0
+#  define PHY_NO		"88E1121"
+# else
+#  define CONFIG_PHY_BASE_ADR	0x8
+#  define PHY_NO		"88E1116"
+# endif
  #endif /* CONFIG_CMD_NET */
 

This looks pretty good.
Ack for both the patches.

Regards..
Prafulla ..

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.aribaud at free.fr]
Sent: Thursday, April 07, 2011 12:48 PM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; Clint Adams
Subject: Re: [U-Boot] [PATCH 2/2] Initialize second PHY on OpenRD-Client and OpenRD-Ultimate.

Le 07/04/2011 08:17, Prafulla Wadaskar a ?crit :

Quoted 8 lines

Quoted 8 lines

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Thursday, April 07, 2011 12:25 AM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; julian.pidancet at citrix.com; Clint Adams
Subject: [PATCH 2/2] Initialize second PHY on OpenRD-Client and

OpenRD-

Quoted 5 lines

Quoted 5 lines

Ultimate.

(rework of Julian Pidancet's patch)

---
  board/Marvell/openrd_base/openrd_base.c |   22 ++++++++++++++++++--

--

Quoted 27 lines

Quoted 27 lines

  include/configs/openrd_base.h           |   14 ++++++++++++--
  2 files changed, 30 insertions(+), 6 deletions(-)

board/Marvell/openrd_base/openrd_base.c +2 -3

index 10109c1..aea4760 100644
@@ -118,12 +118,11 @@ int board_init(void)
  }
 
  #ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
  {
  	u16 reg;
  	u16 devadr;
-	char *name = "egiga0";
 
  	if (miiphy_set_current_dev(name))
  		return;

@@ -148,6 +147,21 @@ void reset_phy(void)
  	/* reset the phy */
  	miiphy_reset(name, devadr);
 

Quoted 10 lines

board/Marvell/openrd_base/openrd_base.c void reset_phy(void)

Quoted 10 lines

board/Marvell/openrd_base/openrd_base.c +9 -1

-	printf("88E1116 Initialized on %s\n", name);
+	printf(PHY_NO" Initialized on %s\n", name);
+}
+
+void reset_phy(void)
+{
+       mv_phy_init("egiga0");
+
+#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+       /* Kirkwood ethernet driver is written with the assumption

that

Quoted 41 lines

Quoted 27 lines

in case
+ * of multiple PHYs, their addresses are consecutive. But
unfortunately
+ * in case of OpenRD-Client, PHY addresses are not
consecutive.*/

board/Marvell/openrd_base/openrd_base.c +5 -0

+       miiphy_write("egiga1", 0xEE, 0xEE, 24);
+
+       /* configure and initialize both PHY's */
+       mv_phy_init("egiga1");
+#endif
  }
  #endif /* CONFIG_RESET_PHY_R */

include/configs/openrd_base.h +4 -2

index 5e05890..aa13908 100644
@@ -117,8 +117,18 @@
   * Ethernet Driver configuration
   */
  #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0x8
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+# else
+#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */

include/configs/openrd_base.h line 133

Quoted 10 lines

include/configs/openrd_base.h +8 -0

+# endif
+# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
+#  define CONFIG_PHY_BASE_ADR	0x0
+#  define PHY_NO		"88E1121"
+# else
+#  define CONFIG_PHY_BASE_ADR	0x8
+#  define PHY_NO		"88E1116"
+# endif
  #endif /* CONFIG_CMD_NET */
 

This looks pretty good.
Ack for both the patches.

Quoted 2 lines

Regards..
Prafulla ..

Didn't Julian re-post patches that actually separates Base, Client and Ultimate into distinct config header files plus a common one? How does this affect Clint's patchset?

Amicalement,
--
Albert.

Quoted 7 lines

Quoted 1 line

Quoted 1 line

   board/Marvell/openrd_base/openrd_base.c |   22 ++++++++++++++++++--

--

Quoted 1 line

Quoted 1 line

   include/configs/openrd_base.h           |   14 ++++++++++++--

Didn't Julian re-post patches that actually separates Base, Client and Ultimate into distinct config header files plus a common one? How does this affect Clint's patchset?

I acked for the method used here.

We don't need separate config headers. Using CONFIG_BOARD_IS_OPENRD_* the boards related stuff can be identified.

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: Monday, April 11, 2011 6:15 PM
To: Prafulla Wadaskar
Cc: u-boot at lists.denx.de; Clint Adams; Julian Pidancet
Subject: Re: [U-Boot] [PATCH 2/2] Initialize second PHY on OpenRD-Client and OpenRD-Ultimate.

Hi Prafulle,

Le 11/04/2011 14:03, Prafulla Wadaskar a ?crit :

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

   board/Marvell/openrd_base/openrd_base.c |   22

++++++++++++++++++--

Quoted 4 lines

Quoted 4 lines

--

Quoted 1 line

Quoted 1 line

   include/configs/openrd_base.h           |   14 ++++++++++++--

Didn't Julian re-post patches that actually separates Base, Client

and

Quoted 1 line

Quoted 1 line

Ultimate into distinct config header files plus a common one? How

does

Quoted 2 lines

Quoted 1 line

this affect Clint's patchset?

Quoted 3 lines

I acked for the method used here.

We don't need separate config headers. Using CONFIG_BOARD_IS_OPENRD_*

the boards related stuff can be identified.

If the two files above are to be used for all Open-RD boards (which is fine for me), then they should be renamed from openrd_base.* to openrd.* for the sake of clarity as to what they actually support.

Amicalement,
--
Albert.

(rework of Julian Pidancet's patch)

---
 board/Marvell/openrd_base/openrd_base.c |   22 ++++++++++++++++++----
 include/configs/openrd_base.h           |   14 ++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

board/Marvell/openrd_base/openrd_base.c +8 -4

index f7c63ac..c71d1ef 100644
@@ -124,12 +124,11 @@ int board_init(void)
 }
 
 #ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
 {
 	u16 reg;
 	u16 devadr;
-	char *name = "egiga0";
 
 	if (miiphy_set_current_dev(name))
 		return;

@@ -154,6 +153,21 @@ void reset_phy(void)
 	/* 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)
+{
+       mv_phy_init("egiga0");

board/Marvell/openrd_base/openrd_base.c +0 -0

 }
 #endif /* CONFIG_RESET_PHY_R */

include/configs/openrd_base.h +5 -2

index 5e05890..aa13908 100644
@@ -117,8 +117,18 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0x8
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+# else
+#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+# endif

(rework of Julian Pidancet's patch)

---
 board/Marvell/openrd_base/openrd_base.c |   24 ++++++++++++++++++++----
 include/configs/openrd_base.h           |   14 ++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Wednesday, April 13, 2011 12:14 AM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; julian.pidancet at citrix.com; Clint Adams
Subject: [PATCH 2/3] Initialize second PHY on OpenRD-Client and OpenRD- Ultimate.

(rework of Julian Pidancet's patch)

---
 board/Marvell/openrd_base/openrd_base.c |   24 ++++++++++++++++++++----
 include/configs/openrd_base.h           |   14 ++++++++++++--
 2 files changed, 32 insertions(+), 6 deletions(-)

board/Marvell/openrd_base/openrd_base.c +11 -4

index f7c63ac..cb0f0fe 100644
@@ -124,12 +124,11 @@ int board_init(void)
 }
 
 #ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
 {
 	u16 reg;
 	u16 devadr;
-	char *name = "egiga0";
 
 	if (miiphy_set_current_dev(name))
 		return;

@@ -154,6 +153,23 @@ void reset_phy(void)
 	/* 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)
+{
+       mv_phy_init("egiga0");
+
+#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+       /* Kirkwood ethernet driver is written with the assumption that

in case
+ * of multiple PHYs, their addresses are consecutive. But
unfortunately
+ * in case of OpenRD-Client, PHY addresses are not
consecutive.*/

board/Marvell/openrd_base/openrd_base.c +4 -0

+       miiphy_write("egiga1", 0xEE, 0xEE, 24);
+#endif
+
+#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT) ||

defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE)

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Wednesday, April 13, 2011 12:14 AM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; julian.pidancet at citrix.com; Clint Adams
Subject: [PATCH 3/3] Rename openrd_base files to openrd.

---
 board/Marvell/openrd/Makefile           |   56 ++++++++++
 board/Marvell/openrd/kwbimage.cfg       |  168
+++++++++++++++++++++++++++++
 board/Marvell/openrd/openrd.c           |  175
+++++++++++++++++++++++++++++++
 board/Marvell/openrd/openrd.h           |   46 ++++++++
 board/Marvell/openrd_base/Makefile      |   56 ----------
 board/Marvell/openrd_base/kwbimage.cfg  |  168 ------------------------
-----
 board/Marvell/openrd_base/openrd_base.c |  175 ------------------------
-------
 board/Marvell/openrd_base/openrd_base.h |   46 --------
 boards.cfg                              |    6 +-
 include/configs/openrd.h                |  142
+++++++++++++++++++++++++
 include/configs/openrd_base.h           |  142 ------------------------
-
 11 files changed, 590 insertions(+), 590 deletions(-)
 create mode 100644 board/Marvell/openrd/Makefile
 create mode 100644 board/Marvell/openrd/kwbimage.cfg

 create mode 100644 board/Marvell/openrd/openrd.c
 create mode 100644 board/Marvell/openrd/openrd.h
 delete mode 100644 board/Marvell/openrd_base/Makefile
 delete mode 100644 board/Marvell/openrd_base/kwbimage.cfg
 delete mode 100644 board/Marvell/openrd_base/openrd_base.c
 delete mode 100644 board/Marvell/openrd_base/openrd_base.h
 create mode 100644 include/configs/openrd.h
 delete mode 100644 include/configs/openrd_base.h

This moves the renames to the begining, removes the unsightly periods from the commit logs, puts "V1" in the Subject headers, breaks up the>80-character line, and hopefully addresses all complaints except for Detlev Zundel's.

If you can rework according to Detlev's suggestion before the end of the merge window, that would be perfect. If not, and unless Prafulla or Wolfgang objects, I will pull this in u-boot-arm, because it works and at last provides support for all of the Open-RD variants. PHY code convergence can come in later.

Quoted 5 lines

If you can rework according to Detlev's suggestion before the end of the merge window, that would be perfect. If not, and unless Prafulla or Wolfgang objects, I will pull this in u-boot-arm, because it works and at last provides support for all of the Open-RD variants. PHY code convergence can come in later.

Sorry for my ignorance here; how would I do that? Apply Andy Fleming's patchset and then rebase off of that?

I'd also like to enable CONFIG_SYS_MVFS for openrd; I notice that no boards are doing that now. Is this something to be avoided?

Thanks

---
 board/Marvell/{openrd_base => openrd}/Makefile     |    2 +-
 board/Marvell/{openrd_base => openrd}/kwbimage.cfg |    0
 .../{openrd_base/openrd_base.c => openrd/openrd.c} |    2 +-
 .../{openrd_base/openrd_base.h => openrd/openrd.h} |    0

 boards.cfg                                         |    2 +-
 include/configs/{openrd_base.h => openrd.h}        |    4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
 rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
 rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (99%)
 rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%)
 rename include/configs/{openrd_base.h => openrd.h} (98%)

---
 MAKEALL                       |    2 ++
 board/Marvell/openrd/openrd.c |    6 ++++++
 boards.cfg                    |    2 ++
 include/configs/openrd.h      |   14 +++++++++++++-
 4 files changed, 23 insertions(+), 1 deletions(-)

---
 MAKEALL                       |    2 ++
 board/Marvell/openrd/openrd.c |    6 ++++++
 boards.cfg                    |    2 ++
 include/configs/openrd.h      |   14 +++++++++++++-
 4 files changed, 23 insertions(+), 1 deletions(-)

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Tuesday, April 26, 2011 6:47 AM
To: u-boot at lists.denx.de
Cc: Albert ARIBAUD; Prafulla Wadaskar; Wolfgang Denk; Clint Adams
Subject: [PATCH v4 0/4] OpenRD-Client and OpenRD-Ultimate support

Changes for v4:
- Various commit log and whitespace tweaks

Clint Adams (4):
Rename openrd_base files to openrd
Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards

 MAKEALL                                            |    2 +
 board/Marvell/{openrd_base => openrd}/Makefile     |    2 +-
 board/Marvell/{openrd_base => openrd}/kwbimage.cfg |    0
 .../{openrd_base/openrd_base.c => openrd/openrd.c} |   33
+++++++++++++++++---
 .../{openrd_base/openrd_base.h => openrd/openrd.h} |    0
 boards.cfg                                         |    4 ++-
 include/configs/{openrd_base.h => openrd.h}        |   33

+++++++++++++++++---

 7 files changed, 62 insertions(+), 12 deletions(-)
 rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
 rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
 rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c}
(80%)
 rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h}
(100%)
 rename include/configs/{openrd_base.h => openrd.h} (81%)

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Tuesday, May 03, 2011 8:31 PM
To: u-boot at lists.denx.de
Cc: Albert ARIBAUD; Prafulla Wadaskar; Wolfgang Denk; Ashish Karkare; Prabhanjan Sarnaik; Clint Adams
Subject: [PATCH v5 0/4] OpenRD-Client and OpenRD-Ultimate support

Changes for v5:
- rebase against current u-boot-marvell.git/master

Clint Adams (4):
Rename openrd_base files to openrd
Add definitions for OpenRD-Client and OpenRD-Ultimate Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Enable multiple fs options for Marvell SoC family on OpenRD boards

 MAKEALL                                            |    2 +
 board/Marvell/{openrd_base => openrd}/Makefile     |    2 +-
 board/Marvell/{openrd_base => openrd}/kwbimage.cfg |    0
 .../{openrd_base/openrd_base.c => openrd/openrd.c} |   33
+++++++++++++++++---
 .../{openrd_base/openrd_base.h => openrd/openrd.h} |    0
 boards.cfg                                         |    4 ++-
 include/configs/{openrd_base.h => openrd.h}        |   33

+++++++++++++++++---

 7 files changed, 62 insertions(+), 12 deletions(-)
 rename board/Marvell/{openrd_base => openrd}/Makefile (98%)
 rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%)
 rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c}
(80%)
 rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h}
(100%)
 rename include/configs/{openrd_base.h => openrd.h} (81%)

Please fix globally, and use checkpatch to verify result.

-----Original Message-----
From: Clint Adams [mailto:clint at debian.org]
Sent: Tuesday, April 19, 2011 5:17 AM
To: u-boot at lists.denx.de
Cc: Albert ARIBAUD; Prafulla Wadaskar; julian.pidancet at citrix.com; Wolfgang Denk; Clint Adams
Subject: [PATCH v2 3/4] Initialize second PHY on OpenRD-Client and OpenRD-Ultimate

(rework of Julian Pidancet's patch)

---

 board/Marvell/openrd/openrd.c |   25 +++++++++++++++++++++----
 include/configs/openrd.h      |   14 ++++++++++++--
 2 files changed, 33 insertions(+), 6 deletions(-)

board/Marvell/openrd/openrd.c +11 -4

index 14ca88e..b2f7adb 100644
@@ -124,12 +124,11 @@ int board_init(void)
 }
 
 #ifdef CONFIG_RESET_PHY_R
-/* Configure and enable MV88E1116 PHY */
-void reset_phy(void)
+/* Configure and enable MV88E1116/88E1121 PHY */
+void mv_phy_init(char *name)
 {
 	u16 reg;
 	u16 devadr;
-	char *name = "egiga0";
 
 	if (miiphy_set_current_dev(name))
 		return;

@@ -154,6 +153,24 @@ void reset_phy(void)
 	/* 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)
+{
+       mv_phy_init("egiga0");
+
+#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
+       /* Kirkwood ethernet driver is written with the assumption that

in case
+ * of multiple PHYs, their addresses are consecutive. But
unfortunately
+ * in case of OpenRD-Client, PHY addresses are not
consecutive.*/

board/Marvell/openrd/openrd.c +8 -0

+       miiphy_write("egiga1", 0xEE, 0xEE, 24);
+#endif
+
+#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT) || \
+    defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE)
+       /* configure and initialize both PHY's */
+       mv_phy_init("egiga1");
+#endif
 }
 #endif /* CONFIG_RESET_PHY_R */

include/configs/openrd.h +12 -3

index 7299749..8d86067 100644
@@ -117,8 +117,18 @@
  * Ethernet Driver configuration
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
-#define CONFIG_PHY_BASE_ADR	0x8
+# ifdef CONFIG_BOARD_IS_OPENRD_BASE
+#  define CONFIG_MVGBE_PORTS	{1, 0}	/* enable port 0 only */
+# else
+#  define CONFIG_MVGBE_PORTS	{1, 1}	/* enable both ports */
+# endif
+# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
+#  define CONFIG_PHY_BASE_ADR	0x0
+#  define PHY_NO		"88E1121"
+# else
+#  define CONFIG_PHY_BASE_ADR	0x8
+#  define PHY_NO		"88E1116"
+# endif
 #endif /* CONFIG_CMD_NET */
 
 /*
--

1.7.4.1

(rework of Julian Pidancet's patch)

---
 board/Marvell/openrd/openrd.c |   25 +++++++++++++++++++++----
 include/configs/openrd.h      |   14 ++++++++++++--
 2 files changed, 33 insertions(+), 6 deletions(-)

---
 include/configs/openrd.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

If you can rework according to Detlev's suggestion before the end of the merge window, that would be perfect. If not, and unless Prafulla or Wolfgang objects, I will pull this in u-boot-arm, because it works and at last provides support for all of the Open-RD variants. PHY code convergence can come in later.

---
  MAKEALL                                 |    2 ++
  board/Marvell/openrd_base/openrd_base.c |    6 ++++++
  boards.cfg                              |    4 +++-
  include/configs/openrd_base.h           |   14 +++++++++++++-
  4 files changed, 24 insertions(+), 2 deletions(-)

This part only initialize second PHY for the OpenRD-Client board and not the OpenRD-Ultimate.
I would do something like:

#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT) ||
defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE)

#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT)
        miiphy_write("egiga1", 0xEE, 0xEE, 24);
#endif
        mv_phy_init("egiga1");

#endif

Or similar.

---
  board/Marvell/openrd/Makefile           |   56 ++++++++++
  board/Marvell/openrd/kwbimage.cfg       |  168 ++++++++++++++++++++++++++++++
  board/Marvell/openrd/openrd.c           |  173 +++++++++++++++++++++++++++++++
  board/Marvell/openrd/openrd.h           |   46 ++++++++
  board/Marvell/openrd_base/Makefile      |   56 ----------
  board/Marvell/openrd_base/kwbimage.cfg  |  168 ------------------------------
  board/Marvell/openrd_base/openrd_base.c |  173 -------------------------------
  board/Marvell/openrd_base/openrd_base.h |   46 --------
  boards.cfg                              |    6 +-
  include/configs/openrd.h                |  142 +++++++++++++++++++++++++
  include/configs/openrd_base.h           |  142 -------------------------
  11 files changed, 588 insertions(+), 588 deletions(-)

create mode 100644 board/Marvell/openrd/Makefile create mode 100644 board/Marvell/openrd/kwbimage.cfg create mode 100644 board/Marvell/openrd/openrd.c create mode 100644 board/Marvell/openrd/openrd.h delete mode 100644 board/Marvell/openrd_base/Makefile delete mode 100644 board/Marvell/openrd_base/kwbimage.cfg delete mode 100644 board/Marvell/openrd_base/openrd_base.c delete mode 100644 board/Marvell/openrd_base/openrd_base.h create mode 100644 include/configs/openrd.h delete mode 100644 include/configs/openrd_base.h

---
  MAKEALL                                 |    2 ++
  board/Marvell/openrd_base/openrd_base.c |    6 ++++++
  boards.cfg                              |    4 +++-
  include/configs/openrd_base.h           |   14 +++++++++++++-
  4 files changed, 24 insertions(+), 2 deletions(-)

I have tested these patches and works for openRD-Base, certainly it may not work for ultimate and client since respective machine ids are not programmed.

May you please provide tuned version of these patches?

You can pass additional options here to identify your board uniquely out of several supported boards (to be coming) For ex:

(quoted diff) +2 -0

+openrd_base                  arm         arm926ejs   openrd
+Marvell        Kirkwood	openrd_common:BOARD_IS_OPENRD_BASE

This approach will help better way to add conditional code for other boards type

For more details refer syntax in the top of this file.

-----Original Message-----
From: Julian Pidancet [mailto:swaplinker at gmail.com] On Behalf Of julian.pidancet at citrix.com
Sent: Friday, March 25, 2011 2:19 PM
To: u-boot at lists.denx.de
Cc: tanmay.upadhyay at einfochips.com; Prafulla Wadaskar; Julian Pidancet
Subject: [PATCH v2 2/4] Change OpenRD Base board identification string.

From: Julian Pidancet <[email protected]>

Renamed from "Openrd_base" to "OpenRD-Base"

Signed-off-by Julian Pidancet <[email protected]>

include/configs/openrd_base.h +0 -0

index 136d3bf..ba57d90 100644

-----Original Message-----
From: Julian Pidancet [mailto:swaplinker at gmail.com] On Behalf Of julian.pidancet at citrix.com
Sent: Friday, March 25, 2011 2:19 PM
To: u-boot at lists.denx.de
Cc: tanmay.upadhyay at einfochips.com; Prafulla Wadaskar; Julian Pidancet
Subject: [PATCH v2 3/4] Add support for the Client variant of the OpenRD board.

From: Julian Pidancet <[email protected]>

This patch takes care of initializing the second PHY of the OpenRD board.

Signed-off-by Julian Pidancet <[email protected]>

 create mode 100644 include/configs/openrd_client.h

include/configs/openrd_client.h new file +22 -0

@@ -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_CLIENT_H
+#define _CONFIG_OPENRD_CLIENT_H

A nice future improvement would be to add variant detection and configuration at run-time as suggested on the mailing-list in a recent email. So one could use the same binary for all board variants.

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Clint Adams
Sent: Saturday, March 26, 2011 3:32 AM
To: u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH v2 0/4] Kirkwood: Add support for OpenRD- Client & OpenRD-Ultimate

Julian Pidancet wrote:

Quoted 1 line

A nice future improvement would be to add variant detection and

configuration

Quoted 1 line

at run-time as suggested on the mailing-list in a recent email. So one

could

Quoted 1 line

use the same binary for all board variants.

Does anyone know offhand how to do this? I have heard rumors of a GPIO method but I haven't found any details.

From: Julian Pidancet<[email protected]>

Kirkwood: Rename openrd_base board files to openrd. Change OpenRD Base board identification string. Add support for the Client variant of the OpenRD board.