diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-11 07:10:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-11 07:10:18 -0400 |
| commit | 7f513e8196589e3b1274132abe3b59e52979e3e5 (patch) | |
| tree | 971e50888e2ce7a42cc409d22d4e2c140e85a48d /drivers/net | |
| parent | b24065c4ef21687787a74eef22dfa9232096f965 (diff) | |
| parent | 1c83df6f3f95055ed1c8fb40d1d0604863eab78b (diff) | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fsl-mc/mc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 8bf25c7040..3a30c03b85 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1336,14 +1336,18 @@ int fsl_mc_ldpaa_exit(bd_t *bd) { int err = 0; bool is_dpl_apply_status = false; + bool mc_boot_status = false; if (bd && mc_lazy_dpl_addr && !fsl_mc_ldpaa_exit(NULL)) { mc_apply_dpl(mc_lazy_dpl_addr); mc_lazy_dpl_addr = 0; } + if (!get_mc_boot_status()) + mc_boot_status = true; + /* MC is not loaded intentionally, So return success. */ - if (bd && get_mc_boot_status() != 0) + if (bd && !mc_boot_status) return 0; /* If DPL is deployed, set is_dpl_apply_status as TRUE. */ @@ -1354,11 +1358,14 @@ int fsl_mc_ldpaa_exit(bd_t *bd) * For case MC is loaded but DPL is not deployed, return success and * print message on console. Else FDT fix-up code execution hanged. */ - if (bd && !get_mc_boot_status() && !is_dpl_apply_status) { + if (bd && mc_boot_status && !is_dpl_apply_status) { printf("fsl-mc: DPL not deployed, DPAA2 ethernet not work\n"); return 0; } + if (bd && mc_boot_status && is_dpl_apply_status) + return 0; + err = dpbp_exit(); if (err < 0) { printf("dpbp_exit() failed: %d\n", err); |