mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-29 07:33:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

powerpc: Drop probecpu() in favour of arch_cpu_init()

Browse Source 
To avoid an unnecessary arch-specific call in board_init_f(), rename this
function.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-01-23 13:31:22 -07:00 committed by Tom Rini
parent 4585601ae2
commit cbcbf71bf2
16 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/cpu/mpc8xxx/cpu.c
View File

@ -308,7 +308,7 @@ int is_core_valid(unsigned int core)
return !!((1 << core) & cpu_mask()); return !!((1 << core) & cpu_mask());
} }
int probecpu (void) int arch_cpu_init(void)
{ {
uint svr; uint svr;
uint ver; uint ver;

2
board/Arcturus/ucp1020/spl.c
View File

@ -83,7 +83,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
bd->bi_memsize = CONFIG_SYS_L2_SIZE; bd->bi_memsize = CONFIG_SYS_L2_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/b4860qds/spl.c
View File

@ -87,7 +87,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/c29xpcie/spl.c
View File

@ -53,7 +53,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
bd->bi_memsize = CONFIG_SYS_L2_SIZE; bd->bi_memsize = CONFIG_SYS_L2_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/p1010rdb/spl.c
View File

@ -69,7 +69,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
bd->bi_memsize = CONFIG_SYS_L2_SIZE; bd->bi_memsize = CONFIG_SYS_L2_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/p1022ds/spl.c
View File

@ -83,7 +83,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
bd->bi_memsize = CONFIG_SYS_L2_SIZE; bd->bi_memsize = CONFIG_SYS_L2_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/p1_p2_rdb_pc/spl.c
View File

@ -80,7 +80,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L2_ADDR;
bd->bi_memsize = CONFIG_SYS_L2_SIZE; bd->bi_memsize = CONFIG_SYS_L2_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t102xqds/spl.c
View File

@ -117,7 +117,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t102xrdb/spl.c
View File

@ -104,7 +104,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t104xrdb/spl.c
View File

@ -95,7 +95,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t208xqds/spl.c
View File

@ -103,7 +103,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t208xrdb/spl.c
View File

@ -73,7 +73,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t4qds/spl.c
View File

@ -112,7 +112,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

2
board/freescale/t4rdb/spl.c
View File

@ -76,7 +76,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)
bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR;
bd->bi_memsize = CONFIG_SYS_L3_SIZE; bd->bi_memsize = CONFIG_SYS_L3_SIZE;
probecpu(); arch_cpu_init();
get_clocks(); get_clocks();
mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR,
CONFIG_SPL_RELOC_MALLOC_SIZE); CONFIG_SPL_RELOC_MALLOC_SIZE);

4
common/board_f.c
View File

@ -858,10 +858,6 @@ static init_fnc_t init_sequence_f[] = {
#endif #endif
initf_malloc, initf_malloc,
initf_console_record, initf_console_record,
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
/* TODO: can this go into arch_cpu_init()? */
probecpu,
#endif
#if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP) #if defined(CONFIG_X86) && defined(CONFIG_HAVE_FSP)
x86_fsp_init, x86_fsp_init,
#endif #endif

12
include/common.h
View File

@ -600,7 +600,17 @@ int cpu_num_dspcores(void);
u32 cpu_mask (void); u32 cpu_mask (void);
u32 cpu_dsp_mask(void); u32 cpu_dsp_mask(void);
int is_core_valid (unsigned int); int is_core_valid (unsigned int);
int probecpu (void);
/**
* arch_cpu_init() - basic cpu-dependent setup for an architecture
*
* This is called after early malloc is available. It should handle any
* CPU- or SoC- specific init needed to continue the init sequence. See
* board_f.c for where it is called. If this is not provided, a default
* version (which does nothing) will be used.
*/
int arch_cpu_init(void);
int checkcpu (void); int checkcpu (void);
int checkicache (void); int checkicache (void);
int checkdcache (void); int checkdcache (void);