Merge with /home/stefan/git/u-boot/bamboo-nand

diff --cc MAKEALL
Simple merge

diff --cc Makefile
index caa5a0e0ad0789d2336267c7b023498871d75a69,99f38afb6f7ffcce3a8f342181b5f473cd985012..463757c43b2cb29f5b7b7a05e0ace8d70a41926c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1038,6 -1035,16 +1038,15 @@@ ASH405_config:        unconfi
  bamboo_config:        unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx bamboo amcc
  
 -      @echo "Compile NAND boot image for bamboo"
 -      @$(MKCONFIG) -a bamboo ppc ppc4xx bamboo amcc
+ bamboo_nand_config:   unconfig
+       @mkdir -p $(obj)include
+       @mkdir -p $(obj)nand_spl
+       @mkdir -p $(obj)board/amcc/bamboo
+       @echo "#define CONFIG_NAND_U_BOOT" > $(obj)include/config.h
++      @$(MKCONFIG) -n $@ -a bamboo ppc ppc4xx bamboo amcc
+       @echo "TEXT_BASE = 0x01000000" > $(obj)board/amcc/bamboo/config.tmp
+       @echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
+ 
  bubinga_config:       unconfig
        @$(MKCONFIG) $(@:_config=) ppc ppc4xx bubinga amcc
  

diff --cc board/amcc/sequoia/sdram.c
Simple merge

diff --cc cpu/ppc4xx/ndfc.c
index 08dfc3295291cf0c602b3380f98d6c5741849bbd,09aac38f488e6a61f8c34b0552cf23175ec66a1a..f63fc79f6cb7770d9deac75ef4758a4abe4e4ad9
--- 1/cpu/ppc4xx/ndfc.c
--- 2/cpu/ppc4xx/ndfc.c
+++ b/cpu/ppc4xx/ndfc.c
@@@ -38,8 -37,10 +38,10 @@@
  
  #include <nand.h>
  #include <linux/mtd/ndfc.h>
+ #include <linux/mtd/nand_ecc.h>
  #include <asm/processor.h>
 -#include <ppc440.h>
+ #include <asm/io.h>
 +#include <ppc4xx.h>
  
  static u8 hwctl = 0;
  

diff --cc cpu/ppc4xx/start.S
Simple merge

diff --cc include/configs/sequoia.h
Simple merge

diff --cc nand_spl/board/amcc/sequoia/Makefile
index b42da8cf682d96e5bb54712a47458d7f183fb3e9,ce39032a9108317e1c358e7f15d8caba4df09ae4..ec1be5a768a5a228570aa5488353bba56a23b32a
--- 1/nand_spl/board/amcc/sequoia/Makefile
--- 2/nand_spl/board/amcc/sequoia/Makefile
+++ b/nand_spl/board/amcc/sequoia/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  #
--# (C) Copyright 2006
++# (C) Copyright 2006-2007
  # Stefan Roese, DENX Software Engineering, sr@denx.de.
  #
  # See file CREDITS for list of people who contributed to this