Skip to contentSkip to conversation

mpc85xx: Fix booting on various boards

PATCH New Anton Vorontsov 2 participants 2 messages Oct 12, 2009 – Oct 16, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mpc85xx: Fix booting on various boards

commit 0e870980a64584a591af775bb9c9fe9450124df9 ("8xxx: Removed CONFIG_NUM_CPUS from 85xx/86xx") breaks U-Boot on various boards, namely the ones that call get_sys_info() from board_early_init_f().

get_sys_info() calls cpu_numcores(), which depends on probecpu() being called before. But probecpu() is called after board_early_init_f(), and so cpu_numcores() returns random values, which in turn crashes get_sys_info().

To fix the issue we place probecpu() before board_early_init_f() in an initialization sequence.

Booting on the following boards should be revived now:
mpc8540ads
mpc8541cds
mpc8548cds
mpc8555cds
mpc8560ads
mpc8568mds
mpc8569mds
and maybe more.

---
 lib_ppc/board.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
lib_ppc/board.c +3 -5
index 8b8ddb5..37f0db9 100644
@@ -251,14 +251,12 @@ static int init_func_watchdog_reset (void)
  */
 
 init_fnc_t *init_sequence[] = {
-
-#if defined(CONFIG_BOARD_EARLY_INIT_F)
-	board_early_init_f,
-#endif
-
 #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
 	probecpu,
 #endif
+#if defined(CONFIG_BOARD_EARLY_INIT_F)
+	board_early_init_f,
+#endif
 #if !defined(CONFIG_8xx_CPUCLK_DEFAULT)
 	get_clocks,		/* get CPU and bus clocks (etc.) */
 #if defined(CONFIG_TQM8xxL) && !defined(CONFIG_TQM866M) \
Signature · 1 line
1.6.3.3
Applied
#1 lore raw

PATCH 1/1 mpc85xx: Fix booting on various boards

Quoted 23 lines · Anton Vorontsov

commit 0e870980a64584a591af775bb9c9fe9450124df9 ("8xxx: Removed CONFIG_NUM_CPUS from 85xx/86xx") breaks U-Boot on various boards, namely the ones that call get_sys_info() from board_early_init_f().

get_sys_info() calls cpu_numcores(), which depends on probecpu() being called before. But probecpu() is called after board_early_init_f(),
and so cpu_numcores() returns random values, which in turn crashes get_sys_info().

To fix the issue we place probecpu() before board_early_init_f() in an initialization sequence.

Booting on the following boards should be revived now:
mpc8540ads
mpc8541cds
mpc8548cds
mpc8555cds
mpc8560ads
mpc8568mds
mpc8569mds
and maybe more.

Quoted 4 lines

---
lib_ppc/board.c | 8 +++-----

1 files changed, 3 insertions(+), 5 deletions(-)

applied to 85xx.

- k