diff options
author | Tom Rini <trini@konsulko.com> | 2020-05-20 08:46:56 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-05-20 08:46:56 -0400 |
commit | b0b13f4114d30b6756e0f6f3b5819d78de22541e (patch) | |
tree | 5e3afc6650d3b9f6040e1d51972120eb3ee2f35e /board/freescale/lx2160a/lx2160a.c | |
parent | 023329284dadbbe7e0ed40bcda8101653997e507 (diff) | |
parent | 13bc860727ee406f073c8176dd2d6b9dacf35443 (diff) | |
download | u-boot-b0b13f4114d30b6756e0f6f3b5819d78de22541e.zip u-boot-b0b13f4114d30b6756e0f6f3b5819d78de22541e.tar.gz u-boot-b0b13f4114d30b6756e0f6f3b5819d78de22541e.tar.bz2 |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Add DM_ETH support for lx2160aqds, ls2080aqds, ls1088aqds
- QSI related fixes on ls1012a, ls2080a, ls1046a, ls1088a, ls1043a based
platforms
- Bug-fixes/updtaes related to ls1046afrwy, fsl-mc, msi-map property
Diffstat (limited to 'board/freescale/lx2160a/lx2160a.c')
-rw-r--r-- | board/freescale/lx2160a/lx2160a.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 88eb66b..73e05ee 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -586,6 +586,9 @@ int board_init(void) sec_init(); #endif +#if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) + pci_init(); +#endif return 0; } @@ -631,7 +634,9 @@ void fdt_fixup_board_enet(void *fdt) if (get_mc_boot_status() == 0 && (is_lazy_dpl_addr_valid() || get_dpl_apply_status() == 0)) { fdt_status_okay(fdt, offset); +#ifndef CONFIG_DM_ETH fdt_fixup_board_phy(fdt); +#endif } else { fdt_status_fail(fdt, offset); } |