diff options
| author | Tom Rini <trini@konsulko.com> | 2019-03-04 21:05:53 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-03-04 21:05:53 +0300 |
| commit | 85887300aedecfc92eed93c7d2538144e8e45dc0 (patch) | |
| tree | df47b2701e4b319870da44ebbeb6a780d109afb2 /board/freescale | |
| parent | 4a9c78a0624fd15766636780017308e3bf529ff4 (diff) | |
| parent | d2c49aad51e930e40a4bff6b4727b070248e7eb5 (diff) | |
| download | u-boot-85887300aedecfc92eed93c7d2538144e8e45dc0.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
- Enable DHCP as boot-source in distro boot for NXP layerscape
platforms
- fix register layout for SEC on Layerscape architectures
- fixes related to DPAA2 ethernet
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/ls1088a/ls1088a.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 953aab6e88..6d11a134dc 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -643,6 +643,11 @@ int arch_misc_init(void) #endif #ifdef CONFIG_FSL_MC_ENET +void board_quiesce_devices(void) +{ + fsl_mc_ldpaa_exit(gd->bd); +} + void fdt_fixup_board_enet(void *fdt) { int offset; @@ -650,7 +655,7 @@ void fdt_fixup_board_enet(void *fdt) offset = fdt_path_offset(fdt, "/fsl-mc"); if (offset < 0) - offset = fdt_path_offset(fdt, "/fsl,dprc@0"); + offset = fdt_path_offset(fdt, "/soc/fsl-mc"); if (offset < 0) { printf("%s: ERROR: fsl-mc node not found in device tree (error %d)\n", @@ -732,7 +737,7 @@ void fsl_fdt_fixup_flash(void *fdt) int ft_board_setup(void *blob, bd_t *bd) { - int err, i; + int i; u64 base[CONFIG_NR_DRAM_BANKS]; u64 size[CONFIG_NR_DRAM_BANKS]; @@ -762,9 +767,6 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_MC_ENET fdt_fixup_board_enet(blob); - err = fsl_mc_ldpaa_exit(bd); - if (err) - return err; #endif if (is_pb_board()) fixup_ls1088ardb_pb_banner(blob); |