Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

powerpc: Add cpu_secondary_init_r to allow for initialization post env setup

Browse source 
We can simplify some cpu/SoC level initialization by moving it to be
after the environment and non-volatile storage is setup as there might
be dependancies on such things in various boot configurations.

For example for FSL SoC's with QE if we boot from NAND we need it setup
to extra the ucode image to initialize the QE.  If we always do this
after environment & non-volatile storage is working we can have the code
be the same regardless of NOR, NAND, SPI, MMC boot.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2011-02-02 11:23:50 -06:00
parent fdb4dad31e
commit f9a33f1c61
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/powerpc/cpu/mpc85xx/cpu_init.c
View file

@ -384,12 +384,6 @@ int cpu_init_r(void)
enable_cpc();
#ifdef CONFIG_QE
uint qe_base = CONFIG_SYS_IMMR + 0x00080000; /* QE immr base */
qe_init(qe_base);
qe_reset();
#endif
/* needs to be in ram since code uses global static vars */
fsl_serdes_init();
@ -449,3 +443,12 @@ int sata_initialize(void)
return 1;
}
#endif
void cpu_secondary_init_r(void)
{
#ifdef CONFIG_QE
uint qe_base = CONFIG_SYS_IMMR + 0x00080000; /* QE immr base */
qe_init(qe_base);
qe_reset();
#endif
}

14
arch/powerpc/lib/board.c
View file

@ -186,6 +186,12 @@ int __board_flash_wp_on(void)
}
int board_flash_wp_on(void) __attribute__((weak, alias("__board_flash_wp_on")));
void __cpu_secondary_init_r(void)
{
}
void cpu_secondary_init_r(void)
__attribute__((weak, alias("__cpu_secondary_init_r")));
static int init_func_ram (void)
{
#ifdef CONFIG_BOARD_TYPES
@ -797,6 +803,14 @@ void board_init_r (gd_t *id, ulong dest_addr)
/* relocate environment function pointers etc. */
env_relocate ();
/*
* after non-volatile devices & environment is setup and cpu code have
* another round to deal with any initialization that might require
* full access to the environment or loading of some image (firmware)
* from a non-volatile device
*/
cpu_secondary_init_r();
/*
* Fill in missing fields of bd_info.
* We do this here, where we have "normal" access to the