Please pull git://www.denx.de/git/u-boot-ppc4xx.git

The following changes since commit 8423e5e31a7235d05a482627315fb11d49c17bd7:
Stefan Roese (1):
Use dynamic SDRAM TLB setup on AMCC Ebony eval board

are found in the git repository at:

git://www.denx.de/git/u-boot-ppc4xx.git

Stefan Roese (24):
nand: Fix patch merge problem
Add AMCC PPC405EZ support
Add AMCC Acadia (405EZ) eval board support Merge with /home/stefan/git/u-boot/acadia
ppc4xx: Fix file mode of include/configs/acadia.h

 MAINTAINERS                  |    1 +
 MAKEALL                      |   32 +-
 Makefile                     |    3 +
 board/amcc/acadia/Makefile   |   47 ++
 board/amcc/acadia/acadia.c   |  152 ++++++
 board/amcc/acadia/config.mk  |   41 ++
 board/amcc/acadia/cpr.c      |  195 ++++++++
 board/amcc/acadia/flash.c    | 1108 ++++++++++++++++++++++++++++++++++++++++++
 board/amcc/acadia/memory.c   |  564 +++++++++++++++++++++
 board/amcc/acadia/u-boot.lds |  150 ++++++
 cpu/ppc4xx/4xx_enet.c        |    3 +
 cpu/ppc4xx/cpu.c             |   18 +-
 cpu/ppc4xx/cpu_init.c        |    3 +-
 cpu/ppc4xx/serial.c          |   97 +++-
 cpu/ppc4xx/speed.c           |  114 +++++-
 cpu/ppc4xx/start.S           |   77 +++-
 cpu/ppc4xx/usb_ohci.c        |    6 +-
 cpu/ppc4xx/vecnum.h          |   42 ++
 include/asm-ppc/processor.h  |    9 +
 include/asm-ppc/u-boot.h     |    4 +-
 include/configs/acadia.h     |  424 ++++++++++++++++
 include/ppc405.h             |  540 ++++++++++++++++++++
 include/ppc4xx_enet.h        |  217 ++++-----
 23 files changed, 3680 insertions(+), 167 deletions(-)
 create mode 100644 board/amcc/acadia/Makefile
 create mode 100644 board/amcc/acadia/acadia.c
 create mode 100644 board/amcc/acadia/config.mk
 create mode 100644 board/amcc/acadia/cpr.c
 create mode 100644 board/amcc/acadia/flash.c
 create mode 100644 board/amcc/acadia/memory.c
 create mode 100644 board/amcc/acadia/u-boot.lds
 create mode 100644 include/configs/acadia.h

Done.

Ummm... can you please be a bit more careful regarding coding style issues? I had to clean up trailing white space in board/amcc/acadia/config.mk and board/amcc/acadia/flash.c; indentation not by TABs in board/amcc/acadia/cpr.c;
bad brace style in board/amcc/acadia/memory.c;
and excessive
newlines in board/amcc/acadia/memory.c

I did not clean up some "#if 1" / "#endif" and "#if 0" / "#endif" areas. Please do this yourself.

Also, "board/amcc/acadia/memory.c" has some strange comments. Please clean up.

Why do you return a hard-coded size in cram_init()? I would like to see dynamic sizing like we use in all other systems...

Best regards,

Wolfgang Denk

DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office:  Kirchenstr. 5,       D-82194 Groebenzell,            Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
On a clear disk you can seek forever.

Hi Wolfgang,

I know that this code badly needs some cleanup. This is why I added this to the commit text:

Commit: 16c0cc1c82081a493ab87c51980b28336ce1bce8
Author: Stefan Roese <[email protected]> Wed, 21 Mar 2007 13:39:57 +0100

[PATCH] Add AMCC Acadia (405EZ) eval board support

This patch adds support for the new AMCC Acadia eval board.

Please note that this Acadia/405EZ support is still in a beta stage. Still lot's of cleanup needed but we need a preliminary release now.

Commit: e01bd218b00af73499331a1a701625a852cd286f
Author: Stefan Roese <[email protected]> Wed, 21 Mar 2007 13:38:59 +0100

[PATCH] Add AMCC PPC405EZ support

This patch adds support for the new AMCC 405EZ PPC. It is in preparation for the AMCC Acadia board support.

Please note that this Acadia/405EZ support is still in a beta stage. Still lot's of cleanup needed but we need a preliminary release now.

I will do this cleanup in the next week, when I have a little more time.

Yes, I know of all this. Next week.

Sure.

Again, next week. I promise.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
=====================================================================

I would think that even a beta-level driver would have proper usage of tabs and spaces. To me, beta-level is an indication of the feature set or design, not minor things like brace positions. There's no reason you can't run a code beautifier over your source files before submitting them.

Timur Tabi
Linux Kernel Developer @ Freescale

Timur,

Yes, you're right (and Wolfgang of course too). I shouldn't have committed this code in this status. Even when intended to cleanup in a few days. Sorry about that. Will never do this again.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, HRB 165235 Munich, CEO: Wolfgang Denk
Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
=====================================================================