diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-30 10:06:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-30 10:06:54 -0400 |
| commit | b9da77f1958aab4ec50ff2f095b40464ca2489dd (patch) | |
| tree | 1414cf3b7c8d9b40b574e08b71943f4d13b614f5 /board/freescale/ls1043ardb/ls1043ardb.c | |
| parent | 6864fc8704661878294d1f0f981f47e864ef470f (diff) | |
| parent | 206f37547e2c0f6d9bb2c37bc51d71f87e965bae (diff) | |
| download | u-boot-b9da77f1958aab4ec50ff2f095b40464ca2489dd.zip u-boot-b9da77f1958aab4ec50ff2f095b40464ca2489dd.tar.gz u-boot-b9da77f1958aab4ec50ff2f095b40464ca2489dd.tar.bz2 | |
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 'board/freescale/ls1043ardb/ls1043ardb.c')
| -rw-r--r-- | board/freescale/ls1043ardb/ls1043ardb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index 9bc78d6..26a1929 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -285,8 +285,10 @@ int ft_board_setup(void *blob, bd_t *bd) ft_cpu_setup(blob, bd); #ifdef CONFIG_SYS_DPAA_FMAN +#ifndef CONFIG_DM_ETH fdt_fixup_fman_ethernet(blob); #endif +#endif fdt_fixup_icid(blob); |