| Message ID | 1398878474-4180-5-git-send-email-agraf@suse.de |
|---|---|
| State | Superseded |
| Delegated to: | York Sun |
| Headers | show |
On 04/30/2014 10:21 AM, Alexander Graf wrote: > The new generic board_init_f has an argument now that takes a number of > prepopulated gd->flags bits. We don't have any, so let's set this to 0. > > Signed-off-by: Alexander Graf <agraf@suse.de> > --- > arch/powerpc/cpu/mpc85xx/start.S | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S > index 0149146..86883f5 100644 > --- a/arch/powerpc/cpu/mpc85xx/start.S > +++ b/arch/powerpc/cpu/mpc85xx/start.S > @@ -1159,6 +1159,7 @@ _start_cont: > isync > > bl cpu_init_f > + li r3, 0 > bl board_init_f > isync > > I have this patch pending already http://patchwork.ozlabs.org/patch/343618/. I can take either one when merging. York
On 30.04.14 19:28, York Sun wrote: > On 04/30/2014 10:21 AM, Alexander Graf wrote: >> The new generic board_init_f has an argument now that takes a number of >> prepopulated gd->flags bits. We don't have any, so let's set this to 0. >> >> Signed-off-by: Alexander Graf <agraf@suse.de> >> --- >> arch/powerpc/cpu/mpc85xx/start.S | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S >> index 0149146..86883f5 100644 >> --- a/arch/powerpc/cpu/mpc85xx/start.S >> +++ b/arch/powerpc/cpu/mpc85xx/start.S >> @@ -1159,6 +1159,7 @@ _start_cont: >> isync >> >> bl cpu_init_f >> + li r3, 0 >> bl board_init_f >> isync >> >> > I have this patch pending already http://patchwork.ozlabs.org/patch/343618/. I > can take either one when merging. Ah, sorry, missed that one. The patch is fairly trivial (though debugging it was not - NULL pointer exceptions in printf() are no fun, heh) and you were first, so please just take your patch. Alex
On 04/30/2014 10:38 AM, Alexander Graf wrote: > > On 30.04.14 19:28, York Sun wrote: >> On 04/30/2014 10:21 AM, Alexander Graf wrote: >>> The new generic board_init_f has an argument now that takes a number of >>> prepopulated gd->flags bits. We don't have any, so let's set this to 0. >>> >>> Signed-off-by: Alexander Graf <agraf@suse.de> >>> --- >>> arch/powerpc/cpu/mpc85xx/start.S | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S >>> index 0149146..86883f5 100644 >>> --- a/arch/powerpc/cpu/mpc85xx/start.S >>> +++ b/arch/powerpc/cpu/mpc85xx/start.S >>> @@ -1159,6 +1159,7 @@ _start_cont: >>> isync >>> >>> bl cpu_init_f >>> + li r3, 0 >>> bl board_init_f >>> isync >>> >>> >> I have this patch pending already http://patchwork.ozlabs.org/patch/343618/. I >> can take either one when merging. > > Ah, sorry, missed that one. The patch is fairly trivial (though > debugging it was not - NULL pointer exceptions in printf() are no fun, > heh) and you were first, so please just take your patch. > I should CC you to save you the time of debugging. It took me a while to find it. York
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 0149146..86883f5 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -1159,6 +1159,7 @@ _start_cont: isync bl cpu_init_f + li r3, 0 bl board_init_f isync
The new generic board_init_f has an argument now that takes a number of prepopulated gd->flags bits. We don't have any, so let's set this to 0. Signed-off-by: Alexander Graf <agraf@suse.de> --- arch/powerpc/cpu/mpc85xx/start.S | 1 + 1 file changed, 1 insertion(+)