| Message ID | 1300338069-11345-1-git-send-email-john.rigby@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Thu, Mar 17, 2011 at 6:01 AM, John Rigby <john.rigby@linaro.org> wrote: > the commit: > mach-ux500: basic HREFv60 support v2 > u8500_init_machine was changed to mop500_init_machine > and 2 of 3 uses instances of .init_machine were changed. > > Fix the 3rd one. > > Signed-off-by: John Rigby <john.rigby@linaro.org> > --- > arch/arm/mach-ux500/board-mop500.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c > index 7b3ff00..f5590a8 100644 > --- a/arch/arm/mach-ux500/board-mop500.c > +++ b/arch/arm/mach-ux500/board-mop500.c > @@ -434,5 +434,5 @@ MACHINE_START(NOMADIK, "ST-Ericsson MOP500 platform") > .init_irq = ux500_init_irq, > /* we re-use nomadik timer here */ > .timer = &ux500_timer, > - .init_machine = u8500_init_machine, > + .init_machine = mop500_init_machine, > MACHINE_END This is a fix on top of a rouge patch from my uglyfixes branch that will never be mainlined, I guess it's on top of the Linaro tree. The only purpose of this one patch is to make the kernel boot from old U-boot versions that pass the machine type NOMADIK instead of U8500 or HREFV60. Sadly such a binary U-boot was all that was given to Linaro, so this was needed to boot. If everyone has better U-boots now, I suggest the patch adding this "Set the u8500 to use the nomadik mach id" be dropped from the Linaro tree instead. Yours, Linus Walleij
On Thu, Mar 17, 2011 at 2:03 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Thu, Mar 17, 2011 at 6:01 AM, John Rigby <john.rigby@linaro.org> wrote: > >> the commit: >> mach-ux500: basic HREFv60 support v2 >> u8500_init_machine was changed to mop500_init_machine >> and 2 of 3 uses instances of .init_machine were changed. >> >> Fix the 3rd one. >> >> Signed-off-by: John Rigby <john.rigby@linaro.org> >> --- >> arch/arm/mach-ux500/board-mop500.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c >> index 7b3ff00..f5590a8 100644 >> --- a/arch/arm/mach-ux500/board-mop500.c >> +++ b/arch/arm/mach-ux500/board-mop500.c >> @@ -434,5 +434,5 @@ MACHINE_START(NOMADIK, "ST-Ericsson MOP500 platform") >> .init_irq = ux500_init_irq, >> /* we re-use nomadik timer here */ >> .timer = &ux500_timer, >> - .init_machine = u8500_init_machine, >> + .init_machine = mop500_init_machine, >> MACHINE_END > > This is a fix on top of a rouge patch from my uglyfixes branch > that will never be mainlined, I guess it's on top of the Linaro > tree. > > The only purpose of this one patch is to make the kernel boot from > old U-boot versions that pass the machine type NOMADIK instead > of U8500 or HREFV60. > > Sadly such a binary U-boot was all that was given to Linaro, so > this was needed to boot. > > If everyone has better U-boots now, I suggest the patch adding this > "Set the u8500 to use the nomadik mach id" be dropped from > the Linaro tree instead. > Thanks for the explanation.
On Thu, 17 Mar 2011, John Rigby wrote: > On Thu, Mar 17, 2011 at 2:03 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > > On Thu, Mar 17, 2011 at 6:01 AM, John Rigby <john.rigby@linaro.org> wrote: > > > >> the commit: > >> mach-ux500: basic HREFv60 support v2 > >> u8500_init_machine was changed to mop500_init_machine > >> and 2 of 3 uses instances of .init_machine were changed. > >> > >> Fix the 3rd one. > >> > >> Signed-off-by: John Rigby <john.rigby@linaro.org> > >> --- > >> arch/arm/mach-ux500/board-mop500.c | 2 +- > >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> > >> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c > >> index 7b3ff00..f5590a8 100644 > >> --- a/arch/arm/mach-ux500/board-mop500.c > >> +++ b/arch/arm/mach-ux500/board-mop500.c > >> @@ -434,5 +434,5 @@ MACHINE_START(NOMADIK, "ST-Ericsson MOP500 platform") > >> .init_irq = ux500_init_irq, > >> /* we re-use nomadik timer here */ > >> .timer = &ux500_timer, > >> - .init_machine = u8500_init_machine, > >> + .init_machine = mop500_init_machine, > >> MACHINE_END > > > > This is a fix on top of a rouge patch from my uglyfixes branch > > that will never be mainlined, I guess it's on top of the Linaro > > tree. > > > > The only purpose of this one patch is to make the kernel boot from > > old U-boot versions that pass the machine type NOMADIK instead > > of U8500 or HREFV60. > > > > Sadly such a binary U-boot was all that was given to Linaro, so > > this was needed to boot. > > > > If everyone has better U-boots now, I suggest the patch adding this > > "Set the u8500 to use the nomadik mach id" be dropped from > > the Linaro tree instead. > > > Thanks for the explanation. Can we confirm that the installed u-boot is indeed passing the appropriate machine number now? Nicolas
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 7b3ff00..f5590a8 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -434,5 +434,5 @@ MACHINE_START(NOMADIK, "ST-Ericsson MOP500 platform") .init_irq = ux500_init_irq, /* we re-use nomadik timer here */ .timer = &ux500_timer, - .init_machine = u8500_init_machine, + .init_machine = mop500_init_machine, MACHINE_END
the commit: mach-ux500: basic HREFv60 support v2 u8500_init_machine was changed to mop500_init_machine and 2 of 3 uses instances of .init_machine were changed. Fix the 3rd one. Signed-off-by: John Rigby <john.rigby@linaro.org> --- arch/arm/mach-ux500/board-mop500.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)