[U-Boot] net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init

[U-Boot] net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init

[Shinya Kuribayashi]

This patch will move au1x00_eth_initialize from net/eth.c to cpu_eth_init
as a part of ongoing eth_initialize cleanup work.  The function ret value
is also fixed as it should be negative on fail.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---
Hi Ben,

build tested. Please review.

  Shinya


 cpu/mips/au1x00_eth.c |    2 +-
 cpu/mips/cpu.c        |    7 +++++++
 include/netdev.h      |    1 +
 net/eth.c             |    4 ----
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index 8ddc06a..6272a3a 100644
--- a/cpu/mips/au1x00_eth.c
+++ b/cpu/mips/au1x00_eth.c
@@ -283,7 +283,7 @@ int au1x00_enet_initialize(bd_t *bis){
 
 	if ((dev = (struct eth_device*)malloc(sizeof *dev)) == NULL) {
 		puts ("malloc failed\n");
-		return 0;
+		return -1;
 	}
 
 	memset(dev, 0, sizeof *dev);
diff --git a/cpu/mips/cpu.c b/cpu/mips/cpu.c
index 38d8697..c70cf0b 100644
--- a/cpu/mips/cpu.c
+++ b/cpu/mips/cpu.c
@@ -73,3 +73,10 @@ void write_one_tlb(int index, u32 pagemask, u32 hi, u32 low0, u32 low1)
 	write_c0_index(index);
 	tlb_write_indexed();
 }
+
+int cpu_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_SOC_AU1X00
+	return au1x00_enet_initialize(bis);
+#endif
+}
diff --git a/include/netdev.h b/include/netdev.h
index 87d578c..b0d5c63 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -41,6 +41,7 @@ int board_eth_init(bd_t *bis);
 int cpu_eth_init(bd_t *bis);
 
 /* Driver initialization prototypes */
+int au1x00_enet_initialize(bd_t*);
 int bfin_EMAC_initialize(bd_t *bis);
 int dc21x4x_initialize(bd_t *bis);
 int e1000_initialize(bd_t *bis);
diff --git a/net/eth.c b/net/eth.c
index ccd871a..9f121c2 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -39,7 +39,6 @@ static int __def_eth_init(bd_t *bis)
 int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 
-extern int au1x00_enet_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_eth_initialize(bd_t *);
@@ -190,9 +189,6 @@ int eth_initialize(bd_t *bis)
 #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 	fec_initialize(bis);
 #endif
-#if defined(CONFIG_AU1X00)
-	au1x00_enet_initialize(bis);
-#endif
 #if defined(CONFIG_IXP4XX_NPE)
 	npe_initialize(bis);
 #endif

[U-Boot] net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init

[Ben Warren]

Hi Shinya,

On Sat, Oct 18, 2008 at 7:31 PM, Shinya Kuribayashi <skuribay@ruby.dti.ne.jp
> wrote:

> This patch will move au1x00_eth_initialize from net/eth.c to cpu_eth_init
> as a part of ongoing eth_initialize cleanup work.  The function ret value
> is also fixed as it should be negative on fail.
>
> Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
> ---
> Hi Ben,
>
> build tested. Please review.
>
thanks for doing this and saving me some work!

>
>  Shinya
>
>
> cpu/mips/au1x00_eth.c |    2 +-
> cpu/mips/cpu.c        |    7 +++++++
> include/netdev.h      |    1 +
> net/eth.c             |    4 ----
> 4 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
> index 8ddc06a..6272a3a 100644
> --- a/cpu/mips/au1x00_eth.c
> +++ b/cpu/mips/au1x00_eth.c
> @@ -283,7 +283,7 @@ int au1x00_enet_initialize(bd_t *bis){
>
>        if ((dev = (struct eth_device*)malloc(sizeof *dev)) == NULL) {
>                puts ("malloc failed\n");
> -               return 0;
> +               return -1;
>        }
>
>        memset(dev, 0, sizeof *dev);
> diff --git a/cpu/mips/cpu.c b/cpu/mips/cpu.c
> index 38d8697..c70cf0b 100644
> --- a/cpu/mips/cpu.c
> +++ b/cpu/mips/cpu.c


Please add #include "netdev.h" to top of this file.

>
> @@ -73,3 +73,10 @@ void write_one_tlb(int index, u32 pagemask, u32 hi, u32
> low0, u32 low1)
>        write_c0_index(index);
>        tlb_write_indexed();
> }
> +
> +int cpu_eth_init(bd_t *bis)
> +{
> +#ifdef CONFIG_SOC_AU1X00
> +       return au1x00_enet_initialize(bis);
> +#endif
> +}

This will warn/error if CONFIG_SOC_AU1X00 isn't defined.  I recommend
something like:

int cpu_eth_init(bd_t *bis)
{
        int rc = 0;
#ifdef CONFIG_SCO_AU1X00
        rc = au1x00_enet_initialize(bis);
#endif
        return rc;
}

>
> diff --git a/include/netdev.h b/include/netdev.h
> index 87d578c..b0d5c63 100644
> --- a/include/netdev.h
> +++ b/include/netdev.h
> @@ -41,6 +41,7 @@ int board_eth_init(bd_t *bis);
> int cpu_eth_init(bd_t *bis);
>
> /* Driver initialization prototypes */
> +int au1x00_enet_initialize(bd_t*);
> int bfin_EMAC_initialize(bd_t *bis);
> int dc21x4x_initialize(bd_t *bis);
> int e1000_initialize(bd_t *bis);
> diff --git a/net/eth.c b/net/eth.c
> index ccd871a..9f121c2 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -39,7 +39,6 @@ static int __def_eth_init(bd_t *bis)
> int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
> int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
>
> -extern int au1x00_enet_initialize(bd_t*);
> extern int fec_initialize(bd_t*);
> extern int mpc8220_fec_initialize(bd_t*);
> extern int mv6436x_eth_initialize(bd_t *);
> @@ -190,9 +189,6 @@ int eth_initialize(bd_t *bis)
> #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
>        fec_initialize(bis);
> #endif
> -#if defined(CONFIG_AU1X00)
> -       au1x00_enet_initialize(bis);
> -#endif
> #if defined(CONFIG_IXP4XX_NPE)
>        npe_initialize(bis);
> #endif
>

[U-Boot] net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init

[Shinya Kuribayashi]

Ben Warren wrote:
>     diff --git a/cpu/mips/cpu.c b/cpu/mips/cpu.c
>     index 38d8697..c70cf0b 100644
>     --- a/cpu/mips/cpu.c
>     +++ b/cpu/mips/cpu.c
> 
> 
> Please add #include "netdev.h" to top of this file.

Oops, will fix.

>     @@ -73,3 +73,10 @@ void write_one_tlb(int index, u32 pagemask, u32
>     hi, u32 low0, u32 low1)
>            write_c0_index(index);
>            tlb_write_indexed();
>     }
>     +
>     +int cpu_eth_init(bd_t *bis)
>     +{
>     +#ifdef CONFIG_SOC_AU1X00
>     +       return au1x00_enet_initialize(bis);
>     +#endif
>     +}
> 
> This will warn/error if CONFIG_SOC_AU1X00 isn't defined.  I recommend 
> something like:
> 
> int cpu_eth_init(bd_t *bis)
> {
>         int rc = 0;
> #ifdef CONFIG_SCO_AU1X00
>         rc = au1x00_enet_initialize(bis);
> #endif
>         return rc;
> }

Ok.  Updated patch will follow soon.

Thanks for your comments,

  Shinya

[U-Boot] [PATCH rev2] net: Move initialization of Au1x00 SoC ethernet MAC to cpu_eth_init

[Shinya Kuribayashi]

This patch will move au1x00_eth_initialize from net/eth.c to cpu_eth_init
as a part of ongoing eth_initialize cleanup work.  The function ret value
is also fixed as it should be negative on fail.

Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
---

Changes in rev2:
* cpu/mips/cpu.c: Include <netdev.h>
* cpu/mips/cpu.c: cpu_eth_init: Always return 0 regardless of
  au1x00_eth_initialize ret value.  We'll ignore it for now since it's
  not used anywhere.

 cpu/mips/au1x00_eth.c |    2 +-
 cpu/mips/cpu.c        |    9 +++++++++
 include/netdev.h      |    1 +
 net/eth.c             |    4 ----
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index 8ddc06a..6272a3a 100644
--- a/cpu/mips/au1x00_eth.c
+++ b/cpu/mips/au1x00_eth.c
@@ -283,7 +283,7 @@ int au1x00_enet_initialize(bd_t *bis){
 
 	if ((dev = (struct eth_device*)malloc(sizeof *dev)) == NULL) {
 		puts ("malloc failed\n");
-		return 0;
+		return -1;
 	}
 
 	memset(dev, 0, sizeof *dev);
diff --git a/cpu/mips/cpu.c b/cpu/mips/cpu.c
index 38d8697..b7180b0 100644
--- a/cpu/mips/cpu.c
+++ b/cpu/mips/cpu.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 #include <asm/mipsregs.h>
 #include <asm/cacheops.h>
 #include <asm/reboot.h>
@@ -73,3 +74,11 @@ void write_one_tlb(int index, u32 pagemask, u32 hi, u32 low0, u32 low1)
 	write_c0_index(index);
 	tlb_write_indexed();
 }
+
+int cpu_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_SOC_AU1X00
+	au1x00_enet_initialize(bis);
+#endif
+	return 0;
+}
diff --git a/include/netdev.h b/include/netdev.h
index 87d578c..b0d5c63 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -41,6 +41,7 @@ int board_eth_init(bd_t *bis);
 int cpu_eth_init(bd_t *bis);
 
 /* Driver initialization prototypes */
+int au1x00_enet_initialize(bd_t*);
 int bfin_EMAC_initialize(bd_t *bis);
 int dc21x4x_initialize(bd_t *bis);
 int e1000_initialize(bd_t *bis);
diff --git a/net/eth.c b/net/eth.c
index ccd871a..9f121c2 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -39,7 +39,6 @@ static int __def_eth_init(bd_t *bis)
 int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 
-extern int au1x00_enet_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_eth_initialize(bd_t *);
@@ -190,9 +189,6 @@ int eth_initialize(bd_t *bis)
 #if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
 	fec_initialize(bis);
 #endif
-#if defined(CONFIG_AU1X00)
-	au1x00_enet_initialize(bis);
-#endif
 #if defined(CONFIG_IXP4XX_NPE)
 	npe_initialize(bis);
 #endif