Patchwork [U-Boot,2/4] microblaze: Enable several ethernet driver compilation

login
register
mail settings
Submitter Stephan Linz
Date Feb. 25, 2012, 10:48 a.m.
Message ID <d30689accb0078c8318165a43564b9596bc60388.1330161511.git.linz@li-pro.net>
Download mbox | patch
Permalink /patch/143041/
State Accepted
Commit 8422a35e9bb4c1c9947258a29d7020a673cf7a2e
Delegated to: Joe Hershberger
Headers show

Comments

Stephan Linz - Feb. 25, 2012, 10:48 a.m.
U-Boot's multipple network supports enables to use
several ethernet drivers but microblaze-generic
platform config file select only one driver.

Reported-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Stephan Linz <linz@li-pro.net>
---
 include/configs/microblaze-generic.h |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
Stephan Linz - Feb. 25, 2012, 11:06 a.m.
Note: this patch depends on commit "microblaze: Enable phylib and mii
support" (http://patchwork.ozlabs.org/patch/142957/)

br-
Stephan

Am Samstag, den 25.02.2012, 11:48 +0100 schrieb Stephan Linz: 
> U-Boot's multipple network supports enables to use
> several ethernet drivers but microblaze-generic
> platform config file select only one driver.
> 
> Reported-by: Michal Simek <monstr@monstr.eu>
> Signed-off-by: Stephan Linz <linz@li-pro.net>
> ---
>  include/configs/microblaze-generic.h |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
> index 9f66fbf..efca136 100644
> --- a/include/configs/microblaze-generic.h
> +++ b/include/configs/microblaze-generic.h
> @@ -65,11 +65,12 @@
>  
>  /* ethernet */
>  #undef CONFIG_SYS_ENET
> -#ifdef XILINX_EMACLITE_BASEADDR
> -# define CONFIG_XILINX_EMACLITE		1
> +#if defined(XILINX_EMACLITE_BASEADDR)
> +# define CONFIG_XILINX_EMACLITE	1
>  # define CONFIG_SYS_ENET
> -#elif XILINX_LLTEMAC_BASEADDR
> -# define CONFIG_XILINX_LL_TEMAC		1
> +#endif
> +#if defined(XILINX_LLTEMAC_BASEADDR)
> +# define CONFIG_XILINX_LL_TEMAC	1
>  # define CONFIG_SYS_ENET
>  #endif
>  #if defined(XILINX_AXIEMAC_BASEADDR)
> @@ -339,7 +340,7 @@
>  #define CONFIG_FIT		1
>  #define CONFIG_OF_LIBFDT	1
>  
> -#if defined(CONFIG_XILINX_AXIEMAC)
> +#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC)
>  # define CONFIG_MII		1
>  # define CONFIG_CMD_MII		1
>  # define CONFIG_PHY_GIGE	1
Joe Hershberger - April 4, 2012, 4:14 p.m.
Hi Stephan,

On Sat, Feb 25, 2012 at 5:06 AM, Stephan Linz <linz@li-pro.net> wrote:
>> U-Boot's multipple network supports enables to use
>> several ethernet drivers but microblaze-generic
>> platform config file select only one driver.

Applied.

Thanks,
-Joe

Patch

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 9f66fbf..efca136 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -65,11 +65,12 @@ 
 
 /* ethernet */
 #undef CONFIG_SYS_ENET
-#ifdef XILINX_EMACLITE_BASEADDR
-# define CONFIG_XILINX_EMACLITE		1
+#if defined(XILINX_EMACLITE_BASEADDR)
+# define CONFIG_XILINX_EMACLITE	1
 # define CONFIG_SYS_ENET
-#elif XILINX_LLTEMAC_BASEADDR
-# define CONFIG_XILINX_LL_TEMAC		1
+#endif
+#if defined(XILINX_LLTEMAC_BASEADDR)
+# define CONFIG_XILINX_LL_TEMAC	1
 # define CONFIG_SYS_ENET
 #endif
 #if defined(XILINX_AXIEMAC_BASEADDR)
@@ -339,7 +340,7 @@ 
 #define CONFIG_FIT		1
 #define CONFIG_OF_LIBFDT	1
 
-#if defined(CONFIG_XILINX_AXIEMAC)
+#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_MII		1
 # define CONFIG_CMD_MII		1
 # define CONFIG_PHY_GIGE	1