diff options
author | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:59 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:59 -0400 |
commit | 08649c3d50b1ca014a9e0bf87c724f99f88a20ce (patch) | |
tree | 55a144349e0fcd807f94f44594623c8c890ae6cb /board/freescale/t4rdb/t4240rdb.c | |
parent | 325b83e04072e22c19d6395f69264bf6bf800146 (diff) | |
parent | 164a5af43635c63ea2459d4c87a1a4b16acd689a (diff) | |
download | u-boot-08649c3d50b1ca014a9e0bf87c724f99f88a20ce.tar.gz |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xxWIP/08Jun2020
- DM_ETH support for P2041RDB, T1024RDB, P5040DS, P3041DS, P4080DS, bug
fixes
- Add TBI PHY access through MII
- DDR: Rework errata workaround for A008109, A008378, 009942
Diffstat (limited to 'board/freescale/t4rdb/t4240rdb.c')
-rw-r--r-- | board/freescale/t4rdb/t4240rdb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index d801f2c7a1..c84de554d3 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -113,7 +113,9 @@ int ft_board_setup(void *blob, bd_t *bd) fsl_fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN +#ifndef CONFIG_DM_ETH fdt_fixup_fman_ethernet(blob); +#endif fdt_fixup_board_enet(blob); #endif |