Merge branch 'denx-coldfire' into coldfire-aug2007

diff --combined MAKEALL
index 9f47f5f858f66dd89d1f91b5f11f1b7732a9b907,4775cfeee72f1b745f1408d7f5838bfea655f673..4467d7570b5d03f6dcfde76324d87c4041509bbb
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -358,12 -358,6 +358,12 @@@ LIST_74xx="              
        ZUMA            \
  "
  
 +LIST_TSEC="           \
 +      ${LIST_85xx}    \
 +      ${LIST_86xx}    \
 +      ${LIST_83xx}    \
 +"
 +
  LIST_7xx="            \
        BAB7xx          \
        CPCI750         \
@@@ -621,8 -615,9 +621,9 @@@ LIST_coldfire="                    
        M5271EVB                \
        M5272C3                 \
        M5282EVB                \
-       TASREG                  \
+       M5329EVB                \
        r5200                   \
+       TASREG                  \
  "
  
  #########################################################################
@@@ -678,7 -673,7 +679,7 @@@ d
        mips|mips_el| \
        nios|nios2| \
        ppc|5xx|5xxx|512x|8xx|8220|824x|8260|83xx|85xx|86xx|4xx|7xx|74xx| \
 -      x86|I486)
 +      x86|I486|TSEC)
                        for target in `eval echo '$LIST_'${arg}`
                        do
                                build_target ${target}

diff --combined Makefile
index 65efd3f5e05906cf8f454335c20480ac38b1d7ab,92db8f494a2dc3dae5ac8fe531d168d86aeab8cc..2bb11b6f883957622d5a6ee031a9a84a9be1ab4a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -209,12 -209,14 +209,14 @@@ LIBS += drivers/libdrivers.
  LIBS += drivers/bios_emulator/libatibiosemu.a
  LIBS += drivers/nand/libnand.a
  LIBS += drivers/nand_legacy/libnand_legacy.a
+ LIBS += drivers/net/libnet.a
  ifeq ($(CPU),mpc83xx)
  LIBS += drivers/qe/qe.a
  endif
  ifeq ($(CPU),mpc85xx)
  LIBS += drivers/qe/qe.a
  endif
+ LIBS += drivers/serial/libserial.a
  LIBS += drivers/sk98lin/libsk98lin.a
  LIBS += post/libpost.a post/drivers/libpostdrivers.a
  LIBS += $(shell if [ -d post/lib_$(ARCH) ]; then echo \
@@@ -1672,6 -1674,18 +1674,18 @@@ TASREG_config :               unconfi
  r5200_config :                unconfig
        @$(MKCONFIG) $(@:_config=) m68k mcf52x2 r5200
  
+ M5329AFEE_config \
+ M5329BFEE_config :    unconfig
+       @case "$@" in \
+       M5329AFEE_config)       NAND=0;; \
+       M5329BFEE_config)       NAND=16;; \
+       esac; \
+       >include/config.h ; \
+       if [ "$${NAND}" != "0" ] ; then \
+               echo "#define NANDFLASH_SIZE    $${NAND}" >> include/config.h ; \
+       fi
+       @$(MKCONFIG) -a M5329EVB m68k mcf532x m5329evb freescale
+ 
  #########################################################################
  ## MPC83xx Systems
  #########################################################################
@@@ -1900,7 -1914,7 +1914,7 @@@ TQM8560_config:         unconfi
  #########################################################################
  
  MPC8641HPCN_config:    unconfig
 -      @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn
 +      @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
  
  sbc8641d_config:      unconfig
        @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d