linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

powerpc/mpc85xx: Fix boot_flag for calling board_init_f()

Browse Source 
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>
This commit is contained in:
York Sun
2014-04-30 14:43:47 -07:00
parent bffac7aef5
commit 701e640145
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/cpu/mpc85xx/cpu_init.c
View File

@ -368,12 +368,12 @@ void fsl_erratum_a007212_workaround(void)
} }
#endif #endif
void cpu_init_f (void) ulong cpu_init_f(void)
{ {
ulong flag = 0;
extern void m8560_cpm_reset (void); extern void m8560_cpm_reset (void);
#ifdef CONFIG_SYS_DCSRBAR_PHYS #ifdef CONFIG_SYS_DCSRBAR_PHYS
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
gd = (gd_t *)(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
#endif #endif
#if defined(CONFIG_SECURE_BOOT) #if defined(CONFIG_SECURE_BOOT)
struct law_entry law; struct law_entry law;
@ -442,13 +442,14 @@ void cpu_init_f (void)
#ifdef CONFIG_DEEP_SLEEP #ifdef CONFIG_DEEP_SLEEP
/* disable the console if boot from deep sleep */ /* disable the console if boot from deep sleep */
if (in_be32(&gur->scrtsr[0]) & (1 << 3)) if (in_be32(&gur->scrtsr[0]) & (1 << 3))
gd->flags |= GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE; flag = GD_FLG_SILENT | GD_FLG_DISABLE_CONSOLE;
#endif #endif
#endif #endif
#ifdef CONFIG_SYS_FSL_ERRATUM_A007212 #ifdef CONFIG_SYS_FSL_ERRATUM_A007212
fsl_erratum_a007212_workaround(); fsl_erratum_a007212_workaround();
#endif #endif
return flag;
} }
/* Implement a dummy function for those platforms w/o SERDES */ /* Implement a dummy function for those platforms w/o SERDES */

4
arch/powerpc/cpu/mpc85xx/spl_minimal.c
View File

@ -12,7 +12,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
void cpu_init_f(void) ulong cpu_init_f(void)
{ {
#ifdef CONFIG_SYS_INIT_L2_ADDR #ifdef CONFIG_SYS_INIT_L2_ADDR
ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR; ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
@ -27,6 +27,8 @@ void cpu_init_f(void)
out_be32(&l2cache->l2ctl, out_be32(&l2cache->l2ctl,
(MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2SRAM_ENTIRE)); (MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2SRAM_ENTIRE));
#endif #endif
return 0;
} }
#ifndef CONFIG_SYS_FSL_TBCLK_DIV #ifndef CONFIG_SYS_FSL_TBCLK_DIV

2
arch/powerpc/cpu/mpc85xx/start.S
View File

@ -1158,7 +1158,7 @@ _start_cont:
mtmsr r3 mtmsr r3
isync isync
bl cpu_init_f bl cpu_init_f /* return boot_flag for calling board_init_f */
bl board_init_f bl board_init_f
isync isync

5
include/common.h
View File

@ -729,9 +729,12 @@ void get_sys_info ( sys_info_t * );
#if defined(CONFIG_8xx) || defined(CONFIG_MPC8260) #if defined(CONFIG_8xx) || defined(CONFIG_MPC8260)
void cpu_init_f (volatile immap_t *immr); void cpu_init_f (volatile immap_t *immr);
#endif #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); void cpu_init_f (void);
#endif #endif
#ifdef CONFIG_MPC85xx
ulong cpu_init_f(void);
#endif
int cpu_init_r (void); int cpu_init_r (void);
#if defined(CONFIG_MPC8260) #if defined(CONFIG_MPC8260)