Merge commit '7b2fac7654f7420c2787f74ec3b1540fa3b343e9'

[oweals/u-boot.git] / board / freescale / corenet_ds / corenet_ds.c

diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 93241251b8e003af471eb63ce9efbb8c0197a475..b1e7823185afb4905452cc1555460b2ce3143b92 100644 (file)
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -142,7 +142,9 @@ int board_early_init_r(void)
                        0, flash_esel, BOOKE_PAGESZ_256M, 1);   /* ts, esel, tsize, iprot */
 
        set_liodns();
+#ifdef CONFIG_SYS_DPAA_QBMAN
        setup_portals();
+#endif
 
        return 0;
 }
@@ -234,6 +236,7 @@ void ft_board_setup(void *blob, bd_t *bd)
 #endif
 
        fdt_fixup_liodn(blob);
+       fdt_fixup_dr_usb(blob, bd);
 }
 
 int board_eth_init(bd_t *bis)