public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] socfpga: initialize designware ethernet
@ 2014-07-11  9:45 Pavel Machek
  2014-07-11  9:49 ` Marek Vasut
  2014-07-13  8:06 ` [U-Boot] [PATCHv2] " Pavel Machek
  0 siblings, 2 replies; 10+ messages in thread
From: Pavel Machek @ 2014-07-11  9:45 UTC (permalink / raw)
  To: u-boot

Enable initialization fo designware ethernet controller. With this
patch, ethernet works in my configuration, provided I set ethernet
address in the environment.

Signed-off-by: Pavel Machek <pavel@denx.de>

diff --git a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h b/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
index f564046..a6d1680 100644
--- a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
+++ b/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
@@ -14,5 +14,7 @@
 #define SOCFPGA_CLKMGR_ADDRESS 0xffd04000
 #define SOCFPGA_RSTMGR_ADDRESS 0xffd05000
 #define SOCFPGA_SYSMGR_ADDRESS 0xffd08000
+#define SOCFPGA_EMAC0_ADDRESS 0xff700000
+#define SOCFPGA_EMAC1_ADDRESS 0xff702000
 
 #endif /* _SOCFPGA_BASE_ADDRS_H_ */
diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c
index a960eb6..2214ab7 100644
--- a/board/altera/socfpga/socfpga_cyclone5.c
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@ -1,5 +1,6 @@
 /*
  *  Copyright (C) 2012 Altera Corporation <www.altera.com>
+ *  Copyright (C) 2014 Pavel Machek, pavel at denx.de
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -7,7 +8,7 @@
 #include <common.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
-
+#include <miiphy.h>
 #include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -67,5 +68,11 @@ int overwrite_console(void)
 /* We know all the init functions have been run now */
 int board_eth_init(bd_t *bis)
 {
+#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
+       /* initialize and register the emac */
+	int rval = designware_initialize(CONFIG_EMAC_BASE, CONFIG_PHY_INTERFACE_MODE);
+	return rval;
+#else
 	return 0;
+#endif
 }
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 0254249..c9c8e53 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -206,6 +209,38 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 /*
+ * network support
+ */
+#ifndef CONFIG_SOCFPGA_VIRTUAL_TARGET
+#define CONFIG_DESIGNWARE_ETH          1
+#endif
+
+#ifdef CONFIG_DESIGNWARE_ETH
+#define CONFIG_EMAC0_BASE              SOCFPGA_EMAC0_ADDRESS
+#define CONFIG_EMAC1_BASE              SOCFPGA_EMAC1_ADDRESS
+/* console support for network */
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+/* designware */
+#define CONFIG_NET_MULTI
+#define CONFIG_DW_ALTDESCRIPTOR
+#define CONFIG_DW_SEARCH_PHY
+#define CONFIG_MII
+#define CONFIG_PHY_GIGE
+#define CONFIG_DW_AUTONEG
+#define CONFIG_AUTONEG_TIMEOUT         (15 * CONFIG_SYS_HZ)
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_MICREL
+#define CONFIG_PHY_MICREL_KSZ9021
+/* EMAC controller and PHY used */
+#define CONFIG_EMAC_BASE               CONFIG_EMAC1_BASE
+#define CONFIG_EPHY_PHY_ADDR           CONFIG_EPHY1_PHY_ADDR
+#define CONFIG_PHY_INTERFACE_MODE      PHY_INTERFACE_MODE_RGMII
+#endif /* CONFIG_DESIGNWARE_ETH */
+
+/*
  * SPL "Second Program Loader" aka Initial Software
  */
 

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH] socfpga: initialize designware ethernet
  2014-07-11  9:45 [U-Boot] [PATCH] socfpga: initialize designware ethernet Pavel Machek
@ 2014-07-11  9:49 ` Marek Vasut
  2014-07-11 10:40   ` Pavel Machek
  2014-07-13  8:06 ` [U-Boot] [PATCHv2] " Pavel Machek
  1 sibling, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2014-07-11  9:49 UTC (permalink / raw)
  To: u-boot

On Friday, July 11, 2014 at 11:45:56 AM, Pavel Machek wrote:
[...]
> diff --git a/board/altera/socfpga/socfpga_cyclone5.c
> b/board/altera/socfpga/socfpga_cyclone5.c index a960eb6..2214ab7 100644
> --- a/board/altera/socfpga/socfpga_cyclone5.c
> +++ b/board/altera/socfpga/socfpga_cyclone5.c
> @@ -1,5 +1,6 @@
>  /*
>   *  Copyright (C) 2012 Altera Corporation <www.altera.com>
> + *  Copyright (C) 2014 Pavel Machek, pavel at denx.de

NAK ;-) Can you please keep the email address in this extremely relevant comment 
in the same format as above (in the <> chars) .

>   *
>   * SPDX-License-Identifier:	GPL-2.0+
>   */
> @@ -7,7 +8,7 @@
>  #include <common.h>
>  #include <asm/arch/reset_manager.h>
>  #include <asm/io.h>
> -
> +#include <miiphy.h>
>  #include <netdev.h>
> 
>  DECLARE_GLOBAL_DATA_PTR;
> @@ -67,5 +68,11 @@ int overwrite_console(void)
>  /* We know all the init functions have been run now */
>  int board_eth_init(bd_t *bis)
>  {
> +#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
> +       /* initialize and register the emac */
> +	int rval = designware_initialize(CONFIG_EMAC_BASE,
> CONFIG_PHY_INTERFACE_MODE); +	return rval;
> +#else
>  	return 0;
> +#endif
>  }

Can this all not go into cpu_eth_init() and into arch/arm/... instead ?

[...]

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH] socfpga: initialize designware ethernet
  2014-07-11  9:49 ` Marek Vasut
@ 2014-07-11 10:40   ` Pavel Machek
  2014-07-11 10:44     ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Pavel Machek @ 2014-07-11 10:40 UTC (permalink / raw)
  To: u-boot

On Fri 2014-07-11 11:49:49, Marek Vasut wrote:
> On Friday, July 11, 2014 at 11:45:56 AM, Pavel Machek wrote:
> [...]
> > diff --git a/board/altera/socfpga/socfpga_cyclone5.c
> > b/board/altera/socfpga/socfpga_cyclone5.c index a960eb6..2214ab7 100644
> > --- a/board/altera/socfpga/socfpga_cyclone5.c
> > +++ b/board/altera/socfpga/socfpga_cyclone5.c
> > @@ -1,5 +1,6 @@
> >  /*
> >   *  Copyright (C) 2012 Altera Corporation <www.altera.com>
> > + *  Copyright (C) 2014 Pavel Machek, pavel at denx.de
> 
> NAK ;-) Can you please keep the email address in this extremely relevant comment 
> in the same format as above (in the <> chars) .

Umm, note that above is web address and mine is email address :-).

> > @@ -67,5 +68,11 @@ int overwrite_console(void)
> >  /* We know all the init functions have been run now */
> >  int board_eth_init(bd_t *bis)
> >  {
> > +#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
> > +       /* initialize and register the emac */
> > +	int rval = designware_initialize(CONFIG_EMAC_BASE,
> > CONFIG_PHY_INTERFACE_MODE); +	return rval;
> > +#else
> >  	return 0;
> > +#endif
> >  }
> 
> Can this all not go into cpu_eth_init() and into arch/arm/... instead ?

No idea. When I move it to arch/arm/, like this, it still works, so I
guess it can be moved.

Should I prepare new patch?
									Pavel

diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
index 2f1c716..6c64f28 100644
--- a/arch/arm/cpu/armv7/socfpga/misc.c
+++ b/arch/arm/cpu/armv7/socfpga/misc.c
@@ -6,6 +6,8 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <miiphy.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -14,3 +16,19 @@ int dram_init(void)
 	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
 	return 0;
 }
+
+
+/*
+ * DesignWare Ethernet initialization
+ */
+/* We know all the init functions have been run now */
+int board_eth_init(bd_t *bis)
+{
+#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
+       /* initialize and register the emac */
+	return designware_initialize(CONFIG_EMAC_BASE,
+				     CONFIG_PHY_INTERFACE_MODE);
+#else
+	return 0;
+#endif
+}
diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c
index 2214ab7..5cbe695 100644
--- a/board/altera/socfpga/socfpga_cyclone5.c
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@ -8,8 +8,6 @@
 #include <common.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
-#include <miiphy.h>
-#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -61,18 +59,3 @@ int overwrite_console(void)
 	return 0;
 }
 #endif
-
-/*
- * DesignWare Ethernet initialization
- */
-/* We know all the init functions have been run now */
-int board_eth_init(bd_t *bis)
-{
-#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
-       /* initialize and register the emac */
-	int rval = designware_initialize(CONFIG_EMAC_BASE, CONFIG_PHY_INTERFACE_MODE);
-	return rval;
-#else
-	return 0;
-#endif
-}


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCH] socfpga: initialize designware ethernet
  2014-07-11 10:40   ` Pavel Machek
@ 2014-07-11 10:44     ` Marek Vasut
  0 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2014-07-11 10:44 UTC (permalink / raw)
  To: u-boot

On Friday, July 11, 2014 at 12:40:06 PM, Pavel Machek wrote:

[...]

> > >   *  Copyright (C) 2012 Altera Corporation <www.altera.com>
> > > 
> > > + *  Copyright (C) 2014 Pavel Machek, pavel at denx.de
> > 
> > NAK ;-) Can you please keep the email address in this extremely relevant
> > comment in the same format as above (in the <> chars) .
> 
> Umm, note that above is web address and mine is email address :-).

It still seems the email addresses are in those <> signs quite often ;-).

> > > @@ -67,5 +68,11 @@ int overwrite_console(void)
> > > 
> > >  /* We know all the init functions have been run now */
> > >  int board_eth_init(bd_t *bis)
> > >  {
> > > 
> > > +#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) &&
> > > !defined(CONFIG_SPL_BUILD) +       /* initialize and register the emac
> > > */
> > > +	int rval = designware_initialize(CONFIG_EMAC_BASE,
> > > CONFIG_PHY_INTERFACE_MODE); +	return rval;
> > > +#else
> > > 
> > >  	return 0;
> > > 
> > > +#endif
> > > 
> > >  }
> > 
> > Can this all not go into cpu_eth_init() and into arch/arm/... instead ?
> 
> No idea. When I move it to arch/arm/, like this, it still works, so I
> guess it can be moved.
> 
> Should I prepare new patch?

Yes please, but I can only give you a general guidance, I'm no socfpga expert.

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCHv2] socfpga: initialize designware ethernet
  2014-07-11  9:45 [U-Boot] [PATCH] socfpga: initialize designware ethernet Pavel Machek
  2014-07-11  9:49 ` Marek Vasut
@ 2014-07-13  8:06 ` Pavel Machek
  2014-07-13 13:30   ` Marek Vasut
  2014-07-14 12:14   ` [U-Boot] [PATCHv3] " Pavel Machek
  1 sibling, 2 replies; 10+ messages in thread
From: Pavel Machek @ 2014-07-13  8:06 UTC (permalink / raw)
  To: u-boot

Enable initialization fo designware ethernet controller. With this
patch, ethernet works in my configuration, provided I set ethernet
address in the environment.

Signed-off-by: Pavel Machek <pavel@denx.de>

---

Changes from v1: moved ethernet initialization to arch/arm, as
suggested by Marek.

diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
index 2f1c716..6c64f28 100644
--- a/arch/arm/cpu/armv7/socfpga/misc.c
+++ b/arch/arm/cpu/armv7/socfpga/misc.c
@@ -6,6 +6,8 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <miiphy.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -14,3 +16,19 @@ int dram_init(void)
 	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
 	return 0;
 }
+
+
+/*
+ * DesignWare Ethernet initialization
+ */
+/* We know all the init functions have been run now */
+int board_eth_init(bd_t *bis)
+{
+#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
+       /* initialize and register the emac */
+	return designware_initialize(CONFIG_EMAC_BASE,
+				     CONFIG_PHY_INTERFACE_MODE);
+#else
+	return 0;
+#endif
+}
diff --git a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h b/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
index f564046..a6d1680 100644
--- a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
+++ b/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
@@ -14,5 +14,7 @@
 #define SOCFPGA_CLKMGR_ADDRESS 0xffd04000
 #define SOCFPGA_RSTMGR_ADDRESS 0xffd05000
 #define SOCFPGA_SYSMGR_ADDRESS 0xffd08000
+#define SOCFPGA_EMAC0_ADDRESS 0xff700000
+#define SOCFPGA_EMAC1_ADDRESS 0xff702000
 
 #endif /* _SOCFPGA_BASE_ADDRS_H_ */
diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c
index a960eb6..5cbe695 100644
--- a/board/altera/socfpga/socfpga_cyclone5.c
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@ -8,8 +9,6 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
 
-#include <netdev.h>
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #if defined(CONFIG_DISPLAY_CPUINFO)
@@ -60,12 +59,3 @@ int overwrite_console(void)
 	return 0;
 }
 #endif
-
-/*
- * DesignWare Ethernet initialization
- */
-/* We know all the init functions have been run now */
-int board_eth_init(bd_t *bis)
-{
-	return 0;
-}
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 0254249..c9c8e53 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -206,6 +209,38 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 /*
+ * network support
+ */
+#ifndef CONFIG_SOCFPGA_VIRTUAL_TARGET
+#define CONFIG_DESIGNWARE_ETH          1
+#endif
+
+#ifdef CONFIG_DESIGNWARE_ETH
+#define CONFIG_EMAC0_BASE              SOCFPGA_EMAC0_ADDRESS
+#define CONFIG_EMAC1_BASE              SOCFPGA_EMAC1_ADDRESS
+/* console support for network */
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+/* designware */
+#define CONFIG_NET_MULTI
+#define CONFIG_DW_ALTDESCRIPTOR
+#define CONFIG_DW_SEARCH_PHY
+#define CONFIG_MII
+#define CONFIG_PHY_GIGE
+#define CONFIG_DW_AUTONEG
+#define CONFIG_AUTONEG_TIMEOUT         (15 * CONFIG_SYS_HZ)
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_MICREL
+#define CONFIG_PHY_MICREL_KSZ9021
+/* EMAC controller and PHY used */
+#define CONFIG_EMAC_BASE               CONFIG_EMAC1_BASE
+#define CONFIG_EPHY_PHY_ADDR           CONFIG_EPHY1_PHY_ADDR
+#define CONFIG_PHY_INTERFACE_MODE      PHY_INTERFACE_MODE_RGMII
+#endif /* CONFIG_DESIGNWARE_ETH */
+
+/*
  * SPL "Second Program Loader" aka Initial Software
  */
 

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCHv2] socfpga: initialize designware ethernet
  2014-07-13  8:06 ` [U-Boot] [PATCHv2] " Pavel Machek
@ 2014-07-13 13:30   ` Marek Vasut
  2014-07-14 12:14   ` [U-Boot] [PATCHv3] " Pavel Machek
  1 sibling, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2014-07-13 13:30 UTC (permalink / raw)
  To: u-boot

On Sunday, July 13, 2014 at 10:06:50 AM, Pavel Machek wrote:
[...]
> @@ -14,3 +16,19 @@ int dram_init(void)
>  	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
>  	return 0;
>  }
> +
> +
> +/*
> + * DesignWare Ethernet initialization
> + */
> +/* We know all the init functions have been run now */
> +int board_eth_init(bd_t *bis)

This would be cpu_eth_init()

> +{
> +#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
> +       /* initialize and register the emac */
> +	return designware_initialize(CONFIG_EMAC_BASE,
> +				     CONFIG_PHY_INTERFACE_MODE);
> +#else
> +	return 0;
> +#endif
> +}
[...]
Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCHv3] socfpga: initialize designware ethernet
  2014-07-13  8:06 ` [U-Boot] [PATCHv2] " Pavel Machek
  2014-07-13 13:30   ` Marek Vasut
@ 2014-07-14 12:14   ` Pavel Machek
  2014-07-14 12:28     ` Marek Vasut
  2014-08-30 15:13     ` [U-Boot] [U-Boot, PATCHv3] " Tom Rini
  1 sibling, 2 replies; 10+ messages in thread
From: Pavel Machek @ 2014-07-14 12:14 UTC (permalink / raw)
  To: u-boot


Enable initialization fo designware ethernet controller. With this
patch, ethernet works in my configuration, provided I set ethernet
address in the environment.

Signed-off-by: Pavel Machek <pavel@denx.de>

---
 
Changes from v1: moved ethernet initialization to arch/arm, as
suggested by Marek.

Changes from v2: use right function name after moving to
arch/arm. Thanks to Marek.

Patch hand-edited so that it can be applied after the "timer counts
down" fix. 

diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c
index 2f1c716..bb71c91 100644
--- a/arch/arm/cpu/armv7/socfpga/misc.c
+++ b/arch/arm/cpu/armv7/socfpga/misc.c
@@ -6,6 +6,8 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <miiphy.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -14,3 +16,18 @@ int dram_init(void)
 	gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
 	return 0;
 }
+
+
+/*
+ * DesignWare Ethernet initialization
+ */
+int cpu_eth_init(bd_t *bis)
+{
+#if !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) && !defined(CONFIG_SPL_BUILD)
+       /* initialize and register the emac */
+	return designware_initialize(CONFIG_EMAC_BASE,
+				     CONFIG_PHY_INTERFACE_MODE);
+#else
+	return 0;
+#endif
+}
diff --git a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h b/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
index f564046..a6d1680 100644
--- a/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
+++ b/arch/arm/include/asm/arch-socfpga/socfpga_base_addrs.h
@@ -14,5 +14,7 @@
 #define SOCFPGA_CLKMGR_ADDRESS 0xffd04000
 #define SOCFPGA_RSTMGR_ADDRESS 0xffd05000
 #define SOCFPGA_SYSMGR_ADDRESS 0xffd08000
+#define SOCFPGA_EMAC0_ADDRESS 0xff700000
+#define SOCFPGA_EMAC1_ADDRESS 0xff702000
 
 #endif /* _SOCFPGA_BASE_ADDRS_H_ */
diff --git a/board/altera/socfpga/socfpga_cyclone5.c b/board/altera/socfpga/socfpga_cyclone5.c
index a960eb6..5cbe695 100644
--- a/board/altera/socfpga/socfpga_cyclone5.c
+++ b/board/altera/socfpga/socfpga_cyclone5.c
@@ -60,12 +59,3 @@ int overwrite_console(void)
 	return 0;
 }
 #endif
-
-/*
- * DesignWare Ethernet initialization
- */
-/* We know all the init functions have been run now */
-int board_eth_init(bd_t *bis)
-{
-	return 0;
-}
diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index 0254249..cc4f690 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -201,12 +204,44 @@
 #else
 #define CONFIG_SYS_TIMER_RATE		25000000
 #endif
 #define CONFIG_SYS_TIMER_COUNTS_DOWN
 #define CONFIG_SYS_TIMER_COUNTER	(CONFIG_SYS_TIMERBASE + 0x4)
 
 #define CONFIG_ENV_IS_NOWHERE
 
 /*
+ * network support
+ */
+#ifndef CONFIG_SOCFPGA_VIRTUAL_TARGET
+#define CONFIG_DESIGNWARE_ETH          1
+#endif
+
+#ifdef CONFIG_DESIGNWARE_ETH
+#define CONFIG_EMAC0_BASE              SOCFPGA_EMAC0_ADDRESS
+#define CONFIG_EMAC1_BASE              SOCFPGA_EMAC1_ADDRESS
+/* console support for network */
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+/* designware */
+#define CONFIG_NET_MULTI
+#define CONFIG_DW_ALTDESCRIPTOR
+#define CONFIG_DW_SEARCH_PHY
+#define CONFIG_MII
+#define CONFIG_PHY_GIGE
+#define CONFIG_DW_AUTONEG
+#define CONFIG_AUTONEG_TIMEOUT         (15 * CONFIG_SYS_HZ)
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_MICREL
+#define CONFIG_PHY_MICREL_KSZ9021
+/* EMAC controller and PHY used */
+#define CONFIG_EMAC_BASE               CONFIG_EMAC1_BASE
+#define CONFIG_EPHY_PHY_ADDR           CONFIG_EPHY1_PHY_ADDR
+#define CONFIG_PHY_INTERFACE_MODE      PHY_INTERFACE_MODE_RGMII
+#endif /* CONFIG_DESIGNWARE_ETH */
+
+/*
  * SPL "Second Program Loader" aka Initial Software
  */
 

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCHv3] socfpga: initialize designware ethernet
  2014-07-14 12:14   ` [U-Boot] [PATCHv3] " Pavel Machek
@ 2014-07-14 12:28     ` Marek Vasut
  2014-07-14 12:38       ` Pavel Machek
  2014-08-30 15:13     ` [U-Boot] [U-Boot, PATCHv3] " Tom Rini
  1 sibling, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2014-07-14 12:28 UTC (permalink / raw)
  To: u-boot

On Monday, July 14, 2014 at 02:14:17 PM, Pavel Machek wrote:
> Enable initialization fo designware ethernet controller. With this
> patch, ethernet works in my configuration, provided I set ethernet
> address in the environment.
> 
> Signed-off-by: Pavel Machek <pavel@denx.de>
> 
> ---

btw. is there any reason why the patch is missing a diffstat ?

Best regards,
Marek Vasut

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [PATCHv3] socfpga: initialize designware ethernet
  2014-07-14 12:28     ` Marek Vasut
@ 2014-07-14 12:38       ` Pavel Machek
  0 siblings, 0 replies; 10+ messages in thread
From: Pavel Machek @ 2014-07-14 12:38 UTC (permalink / raw)
  To: u-boot

On Mon 2014-07-14 14:28:43, Marek Vasut wrote:
> On Monday, July 14, 2014 at 02:14:17 PM, Pavel Machek wrote:
> > Enable initialization fo designware ethernet controller. With this
> > patch, ethernet works in my configuration, provided I set ethernet
> > address in the environment.
> > 
> > Signed-off-by: Pavel Machek <pavel@denx.de>
> > 
> > ---
> 
> btw. is there any reason why the patch is missing a diffstat ?

I had to hand-edit the patch to make it fit after the time fixes...

(Plus, I don't normally do diffstats as they are not required for
kernel submissions.)

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [U-Boot, PATCHv3] socfpga: initialize designware ethernet
  2014-07-14 12:14   ` [U-Boot] [PATCHv3] " Pavel Machek
  2014-07-14 12:28     ` Marek Vasut
@ 2014-08-30 15:13     ` Tom Rini
  1 sibling, 0 replies; 10+ messages in thread
From: Tom Rini @ 2014-08-30 15:13 UTC (permalink / raw)
  To: u-boot

On Mon, Jul 14, 2014 at 02:14:17PM +0200, Pavel Machek wrote:

> Enable initialization fo designware ethernet controller. With this
> patch, ethernet works in my configuration, provided I set ethernet
> address in the environment.
> 
> Signed-off-by: Pavel Machek <pavel@denx.de>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140830/37b60dbd/attachment.pgp>

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2014-08-30 15:13 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-11  9:45 [U-Boot] [PATCH] socfpga: initialize designware ethernet Pavel Machek
2014-07-11  9:49 ` Marek Vasut
2014-07-11 10:40   ` Pavel Machek
2014-07-11 10:44     ` Marek Vasut
2014-07-13  8:06 ` [U-Boot] [PATCHv2] " Pavel Machek
2014-07-13 13:30   ` Marek Vasut
2014-07-14 12:14   ` [U-Boot] [PATCHv3] " Pavel Machek
2014-07-14 12:28     ` Marek Vasut
2014-07-14 12:38       ` Pavel Machek
2014-08-30 15:13     ` [U-Boot] [U-Boot, PATCHv3] " Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox