[U-Boot] PULL REQUEST (for "next"): please pull u-boot-mpc5xxx

[Anatolij Gustschin]

Hello Wolfgang,

On Sun, 21 Mar 2010 23:34:44 +0100
Wolfgang Denk <wd at denx.de> wrote:

> Dear Anatolij,
> 
> In message <20100321214723.74B904C022 at gemini.denx.de> you wrote:
> > In message <20100321214009.827FF4C022 at gemini.denx.de> you wrote:
> > > The following changes since commit 67c7189dd35cb368ef665126fd17816581bd2e92:
> > >   Renato Andreola (1):
> > >         nios2: Added support to YANU UART
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.denx.de/u-boot-mpc5xxx.git master
> > > 
> > > Anatolij Gustschin (4):
> > >       mpc512x: make MEM IO Control configuration a board config option
> > >       mpc512x: add multi serial PSC support
> > >       mpc5121: add PSC serial communication routines
> > >       mpc5121: add common post_word_load/store code
> > > 
> > >  common/serial.c              |   23 +++
> > >  cpu/mpc512x/Makefile         |    1 +
> > >  cpu/mpc512x/commproc.c       |   25 +++
> > >  cpu/mpc512x/fixed_sdram.c    |    2 +-
> > >  cpu/mpc512x/serial.c         |  353 ++++++++++++++++++++++++++++++++++++++----
> > >  include/asm-ppc/immap_512x.h |  112 +++++++-------
> > >  include/configs/aria.h       |    2 +
> > >  include/configs/mecp5123.h   |    2 +
> > >  include/configs/mpc5121ads.h |    2 +
> > >  include/serial.h             |   15 ++
> > >  10 files changed, 451 insertions(+), 86 deletions(-)
> > >  create mode 100644 cpu/mpc512x/commproc.c
> > 
> > Applied.
> 
> And reverted again.
> 
> Your commit:
> 
> 	commit d774442c60756a8dd5d75de85574120ce375bd72
> 	Author: Anatolij Gustschin <agust at denx.de>
> 	Date:   Tue Mar 16 17:10:03 2010 +0100
> 
> 	    mpc512x: add multi serial PSC support
> 
> breaks a large number of boards really hard because it adds a new
> entry (uninit()) to "struct serial_device" in "include/serial.h",
> without fixing all the places where such a struct gets initialized;
> this results in tons of warnings like these:
> 
> 	serial.c:321: warning: initialization from incompatible pointer type
> 	serial.c:321: warning: initialization from incompatible pointer type
> 	serial.c:321: warning: initialization from incompatible pointer type
> 	serial.c:321: warning: initialization from incompatible pointer type
> 	serial.c:324: warning: initialization from incompatible pointer type
> 	serial.c:324: warning: initialization from incompatible pointer type
> 	serial.c:324: warning: initialization from incompatible pointer type
> 	serial.c:324: warning: initialization from incompatible pointer type
> 	serial.c:327: warning: initialization from incompatible pointer type
> 	serial.c:327: warning: initialization from incompatible pointer type
> 	serial.c:327: warning: initialization from incompatible pointer type
> 	serial.c:327: warning: initialization from incompatible pointer type
> 	serial.c:330: warning: initialization from incompatible pointer type
> 	serial.c:330: warning: initialization from incompatible pointer type
> 	serial.c:330: warning: initialization from incompatible pointer type
> 	serial.c:330: warning: initialization from incompatible pointer type
> 
> and (even worse) in bricking all these boards.
> 
> 
> Please make sure to run MAKEALL when submitting patches!!!

I'm sorry for this.

> [I'll leave this code as is in the u-boot-mpc5xxx repo for now, but I
> will rebase this as soon as you submit a fix.]

What would be the best way to proceed here? I submitted separate
patch to fix this, "serial: fix struct serial_device initialisation".
It is based on u-boot-mpc5xxx repo. But since the directory structure
has been changed now I think that better would be to revert these
four patches in the u-boot-mpc5xxx repo. I can submit rebased
patches which also address this breakage. I also noticed that
adding post_word_load/store to cpu/mpc512x/commproc.c as one patch
does, is actually wrong. So I need to address this, too.

Best regards,
Anatolij