[U-Boot] [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@nxp.com CC: Mingkai Hu mingkai.hu@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@DTSEC3" #endif + #endif
/* QSPI device */
This allows using PCIe NIC without enabling DPAA FMan.
Signed-off-by: York Sun york.sun@nxp.com CC: Mingkai Hu mingkai.hu@nxp.com --- board/freescale/ls1043ardb/Makefile | 2 +- include/configs/ls1043ardb.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/board/freescale/ls1043ardb/Makefile b/board/freescale/ls1043ardb/Makefile index 2a4452e..930c690 100644 --- a/board/freescale/ls1043ardb/Makefile +++ b/board/freescale/ls1043ardb/Makefile @@ -7,6 +7,6 @@ obj-y += ddr.o obj-y += ls1043ardb.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/ls1043ardb.h b/include/configs/ls1043ardb.h index 5e570cd..5e5d1f6 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -250,16 +250,19 @@
/* FMan */ #ifndef SPL_NO_FMAN -#ifdef CONFIG_SYS_DPAA_FMAN -#define CONFIG_FMAN_ENET +#define AQR105_IRQ_MASK 0x40000000 + +#ifdef CONFIG_NET #define CONFIG_PHYLIB -#define CONFIG_PHYLIB_10G #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */ - #define CONFIG_PHY_VITESSE #define CONFIG_PHY_REALTEK +#endif + +#ifdef CONFIG_SYS_DPAA_FMAN +#define CONFIG_FMAN_ENET +#define CONFIG_PHYLIB_10G #define CONFIG_PHY_AQUANTIA -#define AQR105_IRQ_MASK 0x40000000
#define RGMII_PHY1_ADDR 0x1 #define RGMII_PHY2_ADDR 0x2
-----Original Message----- From: York Sun [mailto:york.sun@nxp.com] Sent: Tuesday, April 25, 2017 11:40 PM To: u-boot@lists.denx.de Cc: Mingkai Hu mingkai.hu@nxp.com; york sun york.sun@nxp.com Subject: [PATCH 2/2] armv8: ls1043ardb: Make NET independent of FMan
This allows using PCIe NIC without enabling DPAA FMan.
Signed-off-by: York Sun york.sun@nxp.com CC: Mingkai Hu mingkai.hu@nxp.com
board/freescale/ls1043ardb/Makefile | 2 +- include/configs/ls1043ardb.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/board/freescale/ls1043ardb/Makefile b/board/freescale/ls1043ardb/Makefile index 2a4452e..930c690 100644 --- a/board/freescale/ls1043ardb/Makefile +++ b/board/freescale/ls1043ardb/Makefile @@ -7,6 +7,6 @@ obj-y += ddr.o obj-y += ls1043ardb.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/ls1043ardb.h b/include/configs/ls1043ardb.h index 5e570cd..5e5d1f6 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -250,16 +250,19 @@
/* FMan */ #ifndef SPL_NO_FMAN -#ifdef CONFIG_SYS_DPAA_FMAN -#define CONFIG_FMAN_ENET +#define AQR105_IRQ_MASK 0x40000000
+#ifdef CONFIG_NET #define CONFIG_PHYLIB -#define CONFIG_PHYLIB_10G #define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */
#define CONFIG_PHY_VITESSE #define CONFIG_PHY_REALTEK +#endif
+#ifdef CONFIG_SYS_DPAA_FMAN +#define CONFIG_FMAN_ENET +#define CONFIG_PHYLIB_10G #define CONFIG_PHY_AQUANTIA -#define AQR105_IRQ_MASK 0x40000000
#define RGMII_PHY1_ADDR 0x1
#define RGMII_PHY2_ADDR 0x2
2.7.4
ACK.
And Tested-by: Mingkai Hu mingkai.hu@nxp.com
Thanks, Mingkai
On 04/25/2017 08:40 AM, York Sun wrote:
This allows using PCIe NIC without enabling DPAA FMan.
Signed-off-by: York Sun york.sun@nxp.com CC: Mingkai Hu mingkai.hu@nxp.com
board/freescale/ls1043ardb/Makefile | 2 +- include/configs/ls1043ardb.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
Applied to fsl-qoriq master, awaiting upstream.
York
-----Original Message----- From: York Sun [mailto:york.sun@nxp.com] Sent: Tuesday, April 25, 2017 11:40 PM To: u-boot@lists.denx.de Cc: Mingkai Hu mingkai.hu@nxp.com; york sun york.sun@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@nxp.com CC: Mingkai Hu mingkai.hu@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@DTSEC3" #endif
#endif
/* QSPI device */
2.7.4
ACK.
And Tested-by: Mingkai Hu mingkai.hu@nxp.com
Thanks, Mingkai
On 04/25/2017 08:40 AM, York Sun wrote:
This allows using PCIe NIC without enabling DPAA FMan.
Signed-off-by: York Sun york.sun@nxp.com CC: Mingkai Hu mingkai.hu@nxp.com
board/freescale/ls1046ardb/Makefile | 2 +- include/configs/ls1046ardb.h | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-)
Applied to fsl-qoriq master, awaiting upstream.
York
participants (3)
-
Mingkai Hu -
York Sun -
york sun