diff options
| author | Tom Rini <trini@ti.com> | 2014-05-13 17:09:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-13 17:09:28 -0400 |
| commit | 557a3319089499aa0e55d65a6b43b7137f362003 (patch) | |
| tree | 092341615ca6449473e4d9f7cb2158391bb86892 /include/common.h | |
| parent | 27b4e4b9913f65b52d20485dff3f8800bf78f3d7 (diff) | |
| parent | 8ad5d45e0044f5e64dbe7c6bd4e6aa0121a26b23 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
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 2adf5f90b8c..13e5dc74e63 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) |