diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-16 11:14:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-16 11:14:21 -0500 |
| commit | 14ea1b3635b4af8d9e283e3671f7ee872d50b859 (patch) | |
| tree | b8d1c05256b6f160a598656e797071081bd1f61e /arch/powerpc/cpu/mpc85xx/cpu_init.c | |
| parent | b0db69b4e1e1bf1109bd9d4a5185cbd4058f4a8b (diff) | |
| parent | 750c543ca74a80da4b67882deb967c80fe790c3f (diff) | |
Merge branch '2021-01-15-assorted-improvements'
- Add MBR partition layout writing supporting, clean up code.
- A large number of assorted console/iomux cleanups
- A large number of board_r related cleanups.
- Log enhancements
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/cpu_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index e0f0f7ecda6..e920e01b254 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -1028,7 +1028,7 @@ void arch_preboot_os(void) mtmsr(msr); } -void cpu_secondary_init_r(void) +int cpu_secondary_init_r(void) { #ifdef CONFIG_QE #ifdef CONFIG_U_QE @@ -1040,6 +1040,8 @@ void cpu_secondary_init_r(void) qe_init(qe_base); qe_reset(); #endif + + return 0; } #ifdef CONFIG_BOARD_LATE_INIT |