The 8 following patches posted as followups to this mail are ppc4xx-related changes I intend to get merged in this merge period. Sorry for the late posting, but it took me much longer to get this clean and I feel its a big improvement to the current status of 4xx SDRAM/DDR/DDR2 init code and especially the headers.

These patches require the patches from Grant Erickson to be applied first:

PPC4xx: Enable Primordial Stack for 40x and Unify ECC Handling (1 & 2)

Please review and let me know if you have any comments. Thanks.

Stefan Roese (8): ppc4xx: Consolidate 405 and 440 NAND booting code in start.S ppc4xx: Consolidate PPC4xx SDRAM/DDR/DDR2 defines, part1 ppc4xx: Consolidate PPC4xx SDRAM/DDR/DDR2 defines, part2 ppc4xx: Change Kilauea to use the common DDR2 init function ppc4xx: Fix common ECC generation code for 440GP style platforms ppc4xx: Use new 4xx SDRAM controller enable defines in common ECC code ppc4xx: Remove superfluous dram_init() call or replace it by initdram() ppc4xx: Remove implementations of testdram()

board/amcc/acadia/memory.c | 15 - board/amcc/bamboo/bamboo.c | 67 -- board/amcc/bubinga/bubinga.c | 16 - board/amcc/canyonlands/canyonlands.c | 38 - board/amcc/ebony/ebony.c | 30 - board/amcc/katmai/katmai.c | 30 - board/amcc/kilauea/Makefile | 3 +- board/amcc/kilauea/init.S | 167 ----- board/amcc/kilauea/memory.c | 84 --- board/amcc/luan/luan.c | 44 -- board/amcc/makalu/makalu.c | 5 - board/amcc/ocotea/ocotea.c | 30 - board/amcc/sequoia/sequoia.c | 38 - board/amcc/taihu/taihu.c | 42 -- board/amcc/taishan/taishan.c | 30 - board/amcc/walnut/walnut.c | 16 - board/amcc/yosemite/yosemite.c | 52 +-- board/amcc/yucca/yucca.c | 30 - board/amirix/ap1000/init.S | 4 - board/cray/L1/init.S | 11 - board/csb272/csb272.c | 9 + board/csb472/csb472.c | 9 + board/eric/eric.c | 8 + board/esd/ar405/ar405.c | 22 - board/esd/canbt/canbt.c | 19 - board/exbitgen/exbitgen.c | 9 + board/g2000/g2000.c | 35 - board/jse/init.S | 10 - board/lwmon5/lwmon5.c | 38 - board/ml2/init.S | 4 - board/mpl/mip405/init.S | 13 - board/mpl/pip405/init.S | 13 - board/netstal/hcu4/hcu4.c | 9 - board/netstal/hcu5/sdram.c | 26 +- board/netstal/mcu25/mcu25.c | 9 - board/pcs440ep/pcs440ep.c | 38 - board/prodrive/alpr/alpr.c | 30 - board/w7o/w7o.c | 8 + board/xilinx/ml300/init.S | 4 - board/zeus/zeus.c | 45 -- cpu/ppc4xx/44x_spd_ddr.c | 151 ----- cpu/ppc4xx/44x_spd_ddr2.c | 11 + cpu/ppc4xx/ecc.c | 19 +- cpu/ppc4xx/ecc.h | 27 + cpu/ppc4xx/sdram.c | 10 +- cpu/ppc4xx/start.S | 212 +++---- include/asm-ppc/ppc4xx-sdram.h | 1156 ++++++++++++++++++++++++++++++++ include/configs/alpr.h | 1 - include/configs/bamboo.h | 1 - include/configs/ebony.h | 1 - include/configs/katmai.h | 1 - include/configs/kilauea.h | 8 +- include/configs/luan.h | 1 - include/configs/ocotea.h | 1 - include/configs/taishan.h | 1 - include/configs/yucca.h | 1 - include/ppc405.h | 414 ------------ include/ppc440.h | 896 ------------------------- include/ppc4xx.h | 25 + nand_spl/board/amcc/kilauea/Makefile | 21 +- nand_spl/board/amcc/kilauea/config.mk | 5 +- nand_spl/board/amcc/kilauea/u-boot.lds | 1 - 62 files changed, 1383 insertions(+), 2691 deletions(-) delete mode 100644 board/amcc/kilauea/init.S delete mode 100644 board/amcc/kilauea/memory.c create mode 100644 include/asm-ppc/ppc4xx-sdram.h