diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-26 15:19:27 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-26 15:19:27 (GMT) |
| commit | 380e86f361e4e2aef83295972863654fde157560 (patch) | |
| tree | 5b1f04c1c763f6c06ae099a6eadac4eb2eb6d6b8 /drivers/net | |
| parent | 8dc1b17f14c9201c7d0da0f33e404a7e051b2ec6 (diff) | |
| parent | 7676074ac756ab9566d52544cc836f7b93f80b37 (diff) | |
| download | u-boot-380e86f361e4e2aef83295972863654fde157560.tar.xz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fsl-mc/mc.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 9f69d75..0a74e3e 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1,4 +1,5 @@ /* + * Copyright (C) 2017 NXP Semiconductors * Copyright (C) 2014 Freescale Semiconductor * * SPDX-License-Identifier: GPL-2.0+ @@ -1201,6 +1202,7 @@ err: int fsl_mc_ldpaa_exit(bd_t *bd) { int err = 0; + bool is_dpl_apply_status = false; if (bd && mc_lazy_dpl_addr && !fsl_mc_ldpaa_exit(NULL)) { mc_apply_dpl(mc_lazy_dpl_addr); @@ -1211,14 +1213,18 @@ int fsl_mc_ldpaa_exit(bd_t *bd) if (bd && get_mc_boot_status() != 0) return 0; - if (bd && !get_mc_boot_status() && get_dpl_apply_status() == -1) { - printf("ERROR: fsl-mc: DPL is not applied\n"); - err = -ENODEV; - return err; - } + /* If DPL is deployed, set is_dpl_apply_status as TRUE. */ + if (!get_dpl_apply_status()) + is_dpl_apply_status = true; - if (bd && !get_mc_boot_status() && !get_dpl_apply_status()) - return err; + /* + * 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) { + printf("fsl-mc: DPL not deployed, DPAA2 ethernet not work\n"); + return 0; + } err = dpbp_exit(); if (err < 0) { |