diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-08 08:51:59 -0400 |
| commit | 08649c3d50b1ca014a9e0bf87c724f99f88a20ce (patch) | |
| tree | 55a144349e0fcd807f94f44594623c8c890ae6cb /arch/powerpc/cpu/mpc85xx/cpu_init.c | |
| parent | 325b83e04072e22c19d6395f69264bf6bf800146 (diff) | |
| parent | 164a5af43635c63ea2459d4c87a1a4b16acd689a (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
- DM_ETH support for P2041RDB, T1024RDB, P5040DS, P3041DS, P4080DS, bug
fixes
- Add TBI PHY access through MII
- DDR: Rework errata workaround for A008109, A008378, 009942
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 4bca2671d5..e0f0f7ecda 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -963,8 +963,10 @@ int cpu_init_r(void) #endif #ifdef CONFIG_FMAN_ENET +#ifndef CONFIG_DM_ETH fman_enet_init(); #endif +#endif #if defined(CONFIG_NXP_ESBC) && defined(CONFIG_FSL_CORENET) if (pamu_init() < 0) @@ -1028,13 +1030,13 @@ void arch_preboot_os(void) void cpu_secondary_init_r(void) { +#ifdef CONFIG_QE #ifdef CONFIG_U_QE uint qe_base = CONFIG_SYS_IMMR + 0x00140000; /* QE immr base */ -#elif defined CONFIG_QE +#else uint qe_base = CONFIG_SYS_IMMR + 0x00080000; /* QE immr base */ #endif -#ifdef CONFIG_QE qe_init(qe_base); qe_reset(); #endif |