Merge git://git.denx.de/u-boot-mpc85xx

This commit is contained in:
Tom Rini 2016-01-07 11:24:27 -05:00
commit 3861d784b1

View file

@ -91,6 +91,7 @@ _start:
li r5,GD_SIZE /* parameter 3: count */
bl memset
li r3, 0 /* parameter 1: bootflag */
bl board_init_f /* run 1st part of board init code (in Flash)*/
/* NOTREACHED - board_init_f() does not return */
#else
@ -169,6 +170,7 @@ lowboot_reentry:
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (in Flash)*/
li r3, 0 /* parameter 1: bootflag */
bl board_init_f /* run 1st part of board init code (in Flash)*/
/* NOTREACHED - board_init_f() does not return */