Message ID | 1412329524-31265-1-git-send-email-valentin.longchamp@keymile.com |
---|---|
State | Accepted |
Delegated to: | York Sun |
Headers | show |
On 10/03/2014 02:45 AM, Valentin Longchamp wrote: > The argument boot_flags of board_init_f() is not used at all in the > powerpc specific board.c init sequence. Now with the generic init > sequence, this boot_flags arg is used by board_init_f(). > > This patch sets the r3 register that is used to pass the boot_flags > argument from the start.S board_init_f() call to 0 prior to the function > call to avoid unknown content to end up in gd->flags. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > --- > > arch/powerpc/cpu/mpc83xx/start.S | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S > index 36724e5..8abb3f1 100644 > --- a/arch/powerpc/cpu/mpc83xx/start.S > +++ b/arch/powerpc/cpu/mpc83xx/start.S > @@ -283,6 +283,7 @@ in_flash: > bl cpu_init_f > > /* run 1st part of board init code (in Flash)*/ > + li r3, 0 /* clear boot_flag for calling board_init_f */ > bl board_init_f > > /* NOTREACHED - board_init_f() does not return */ > Kim, This is for 83xx. I think the patch is OK. I can take it in along with other patches when the merge window opens if you are OK. York
On 10/03/2014 02:45 AM, Valentin Longchamp wrote: > The argument boot_flags of board_init_f() is not used at all in the > powerpc specific board.c init sequence. Now with the generic init > sequence, this boot_flags arg is used by board_init_f(). > > This patch sets the r3 register that is used to pass the boot_flags > argument from the start.S board_init_f() call to 0 prior to the function > call to avoid unknown content to end up in gd->flags. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > --- Applied to u-boot-mpc85xx master. Thanks. York
diff --git a/arch/powerpc/cpu/mpc83xx/start.S b/arch/powerpc/cpu/mpc83xx/start.S index 36724e5..8abb3f1 100644 --- a/arch/powerpc/cpu/mpc83xx/start.S +++ b/arch/powerpc/cpu/mpc83xx/start.S @@ -283,6 +283,7 @@ in_flash: bl cpu_init_f /* run 1st part of board init code (in Flash)*/ + li r3, 0 /* clear boot_flag for calling board_init_f */ bl board_init_f /* NOTREACHED - board_init_f() does not return */
The argument boot_flags of board_init_f() is not used at all in the powerpc specific board.c init sequence. Now with the generic init sequence, this boot_flags arg is used by board_init_f(). This patch sets the r3 register that is used to pass the boot_flags argument from the start.S board_init_f() call to 0 prior to the function call to avoid unknown content to end up in gd->flags. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> --- arch/powerpc/cpu/mpc83xx/start.S | 1 + 1 file changed, 1 insertion(+)