colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armv8: ls1046ardb: Make NET independent of FMan

Browse Source 
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>
Acked-by: Mingkai Hu <mingkai.hu@nxp.com>
This commit is contained in:
York Sun
2017-04-25 08:39:51 -07:00
parent 5e3f763a4b
commit 99b47c25d0
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/freescale/ls1046ardb/Makefile
View File

@@ -7,6 +7,6 @@
obj-y += ddr.o obj-y += ddr.o
obj-y += ls1046ardb.o obj-y += ls1046ardb.o
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_SYS_DPAA_FMAN) += eth.o obj-$(CONFIG_NET) += eth.o
obj-y += cpld.o obj-y += cpld.o
endif endif

17
include/configs/ls1046ardb.h
View File

@@ -178,18 +178,20 @@
#define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */ #define CONFIG_ENV_SECT_SIZE 0x40000 /* 256KB */
#endif #endif
#define AQR105_IRQ_MASK 0x80000000
/* FMan */ /* FMan */
#ifndef SPL_NO_FMAN #ifndef SPL_NO_FMAN
#ifdef CONFIG_NET
#define CONFIG_PHYLIB
#define CONFIG_PHY_GIGE /* Include GbE speed/duplex detection */
#define CONFIG_PHY_REALTEK
#endif
#ifdef CONFIG_SYS_DPAA_FMAN #ifdef CONFIG_SYS_DPAA_FMAN
#define CONFIG_FMAN_ENET #define CONFIG_FMAN_ENET
#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 CONFIG_PHY_AQUANTIA
#define AQR105_IRQ_MASK 0x80000000 #define CONFIG_PHYLIB_10G
#define RGMII_PHY1_ADDR 0x1 #define RGMII_PHY1_ADDR 0x1
#define RGMII_PHY2_ADDR 0x2 #define RGMII_PHY2_ADDR 0x2
@@ -200,6 +202,7 @@
#define CONFIG_ETHPRIME "FM1@DTSEC3" #define CONFIG_ETHPRIME "FM1@DTSEC3"
#endif #endif
#endif #endif
/* QSPI device */ /* QSPI device */