projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
[oweals/u-boot.git]
/
board
/
freescale
/
t1040qds
/
t1040qds.c
diff --git
a/board/freescale/t1040qds/t1040qds.c
b/board/freescale/t1040qds/t1040qds.c
index c166403ba4c71882d9022b94c55dc4720b02a4d5..cf38d843ac4b8502800b2397377e76440e61c3dc 100644
(file)
--- a/
board/freescale/t1040qds/t1040qds.c
+++ b/
board/freescale/t1040qds/t1040qds.c
@@
-278,7
+278,9
@@
int ft_board_setup(void *blob, bd_t *bd)
#endif
#ifdef CONFIG_SYS_DPAA_FMAN
+#ifndef CONFIG_DM_ETH
fdt_fixup_fman_ethernet(blob);
+#endif
fdt_fixup_board_enet(blob);
#endif