diff options
| author | York Sun <yorksun@freescale.com> | 2014-04-30 14:43:47 -0700 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2014-05-13 08:31:22 -0700 |
| commit | 701e640145474131161de53a407d95d0d2f77082 (patch) | |
| tree | bc6609cccfed9ec35f3c697bb6b8a7deecdc7058 /include/common.h | |
| parent | bffac7aef54039dbe53dbf8bcbc9f8dbe78b8aa5 (diff) | |
| download | blackbird-obmc-uboot-701e640145474131161de53a407d95d0d2f77082.tar.gz blackbird-obmc-uboot-701e640145474131161de53a407d95d0d2f77082.zip | |
powerpc/mpc85xx: Fix boot_flag for calling board_init_f()
baord_init_f takes one argument, boot_flag. It has not been used for
powerpc, until recently changing to use generic board architecture.
The boot flag is added as a return value from cpu_init_f().
Signed-off-by: York Sun <yorksun@freescale.com>
CC: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 2adf5f90b8..13e5dc74e6 100644 --- a/include/common.h +++ b/include/common.h @@ -729,9 +729,12 @@ void get_sys_info ( sys_info_t * ); #if defined(CONFIG_8xx) || defined(CONFIG_MPC8260) void cpu_init_f (volatile immap_t *immr); #endif -#if defined(CONFIG_4xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MCF52x2) ||defined(CONFIG_MPC86xx) +#if defined(CONFIG_4xx) || defined(CONFIG_MCF52x2) || defined(CONFIG_MPC86xx) void cpu_init_f (void); #endif +#ifdef CONFIG_MPC85xx +ulong cpu_init_f(void); +#endif int cpu_init_r (void); #if defined(CONFIG_MPC8260) |
