diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-30 17:06:54 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-30 17:06:54 +0300 |
| commit | b9da77f1958aab4ec50ff2f095b40464ca2489dd (patch) | |
| tree | 1414cf3b7c8d9b40b574e08b71943f4d13b614f5 /drivers/net/fm/init.c | |
| parent | 6864fc8704661878294d1f0f981f47e864ef470f (diff) | |
| parent | 206f37547e2c0f6d9bb2c37bc51d71f87e965bae (diff) | |
| download | u-boot-b9da77f1958aab4ec50ff2f095b40464ca2489dd.tar.xz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Add DM_ETH support for DPAA1, DPAA2 based RDB platforms: ls1046ardb,
ls1043ardb, lx2160ardb, ls2088ardb, ls1088ardb.
- Add GICv3 support for ls1028a, ls2088a, ls1088a.
- Add lpuart support on ls1028aqds.
- Few bug fixes and updates on ls2088a, ls1012a, ls1046a, ls1021a based
platforms.
Diffstat (limited to 'drivers/net/fm/init.c')
| -rw-r--r-- | drivers/net/fm/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c index f896e80b6d..8669d21afb 100644 --- a/drivers/net/fm/init.c +++ b/drivers/net/fm/init.c @@ -15,6 +15,7 @@ #include "fm.h" +#ifndef CONFIG_DM_ETH struct fm_eth_info fm_info[] = { #if (CONFIG_SYS_NUM_FM1_DTSEC >= 1) FM_DTSEC_INFO_INITIALIZER(1, 1), @@ -380,3 +381,4 @@ int is_qsgmii_riser_card(struct mii_dev *bus, int phy_base_addr, return 0; } +#endif /* CONFIG_DM_ETH */ |