[U-Boot] [PATCH 1/2] armv8: ls1046ardb: Make NET independent of FMan

[Mingkai Hu]

> -----Original Message-----
> From: York Sun [mailto:york.sun at nxp.com]
> Sent: Tuesday, April 25, 2017 11:40 PM
> To: u-boot at lists.denx.de
> Cc: Mingkai Hu <mingkai.hu at nxp.com>; york sun <york.sun at nxp.com>
> Subject: [PATCH 1/2] armv8: ls1046ardb: Make NET independent of FMan
> 
> This allows using PCIe NIC without enabling DPAA FMan.
> 
> Signed-off-by: York Sun <york.sun at nxp.com>
> CC: Mingkai Hu <mingkai.hu at nxp.com>
> ---
>  board/freescale/ls1046ardb/Makefile |  2 +-
>  include/configs/ls1046ardb.h        | 15 +++++++++------
>  2 files changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/board/freescale/ls1046ardb/Makefile
> b/board/freescale/ls1046ardb/Makefile
> index b92ed0b..4076558 100644
> --- a/board/freescale/ls1046ardb/Makefile
> +++ b/board/freescale/ls1046ardb/Makefile
> @@ -7,6 +7,6 @@
>  obj-y += ddr.o
>  obj-y += ls1046ardb.o
>  ifndef CONFIG_SPL_BUILD
> -obj-$(CONFIG_SYS_DPAA_FMAN) += eth.o
> +obj-$(CONFIG_NET) += eth.o
>  obj-y += cpld.o
>  endif
> diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
> index 67ee626..40a5635 100644
> --- a/include/configs/ls1046ardb.h
> +++ b/include/configs/ls1046ardb.h
> @@ -178,18 +178,20 @@
>  #define CONFIG_ENV_SECT_SIZE		0x40000		/*
> 256KB */
>  #endif
> 
> +#define AQR105_IRQ_MASK			0x80000000
>  /* FMan */
>  #ifndef SPL_NO_FMAN
> -#ifdef CONFIG_SYS_DPAA_FMAN
> -#define CONFIG_FMAN_ENET
> +
> +#ifdef CONFIG_NET
>  #define CONFIG_PHYLIB
> -#define CONFIG_PHYLIB_10G
>  #define CONFIG_PHY_GIGE		/* Include GbE speed/duplex
> detection */
> -
>  #define CONFIG_PHY_REALTEK
> -#define CONFIG_PHY_AQUANTIA
> -#define AQR105_IRQ_MASK			0x80000000
> +#endif
> 
> +#ifdef CONFIG_SYS_DPAA_FMAN
> +#define CONFIG_FMAN_ENET
> +#define CONFIG_PHY_AQUANTIA
> +#define CONFIG_PHYLIB_10G
>  #define RGMII_PHY1_ADDR			0x1
>  #define RGMII_PHY2_ADDR			0x2
> 
> @@ -200,6 +202,7 @@
> 
>  #define CONFIG_ETHPRIME			"FM1 at DTSEC3"
>  #endif
> +
>  #endif
> 
>  /* QSPI device */
> --
> 2.7.4

ACK.

And Tested-by: Mingkai Hu <mingkai.hu at nxp.com>

Thanks,
Mingkai