diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-18 23:46:21 -0400 |
| commit | a10a31ec91ad2ee514a42baea9314553aa972676 (patch) | |
| tree | 4fa6eff1efde896343c455854b5c78b2b91bd9e9 /board | |
| parent | 2372b0012925f9100980151f4a28347c82feaba8 (diff) | |
| parent | 1e6fb0e367564d427d7c57fa7b3b972ecb7147a3 (diff) | |
| download | u-boot-a10a31ec91ad2ee514a42baea9314553aa972676.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/ls2080aqds/ls2080aqds.c | 2 | ||||
| -rw-r--r-- | board/freescale/ls2080ardb/ls2080ardb.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 477f55646f..7d95debcaa 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -317,6 +317,8 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory_banks(blob, base, size, 2); + fdt_fixup_dr_usb(blob, bd); + #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); err = fsl_mc_ldpaa_exit(bd); diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index 52e5e3f516..a65cd4ab80 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -281,6 +281,8 @@ int ft_board_setup(void *blob, bd_t *bd) fdt_fixup_memory_banks(blob, base, size, 2); + fdt_fixup_dr_usb(blob, bd); + #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); err = fsl_mc_ldpaa_exit(bd); |