Merge with git://www.denx.de/git/u-boot.git

diff --cc CREDITS
Simple merge

diff --cc MAKEALL
index 2cdf10c28d29e09746e8b49545dfe3441a141ab3,1219fb373f7f6f198576e2a02fc7e400aa2ac2a0..4775cfeee72f1b745f1408d7f5838bfea655f673
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -312,10 -607,16 +607,17 @@@ LIST_microblaze="       
  ## ColdFire Systems
  #########################################################################
  
- LIST_coldfire="       \
-       cobra5272       EB+MCF-EV123    EB+MCF-EV123_internal           \
-       idmr            M5271EVB        M5272C3         M5282EVB        \
-       M5329EVB        r5200           TASREG                          \
+ LIST_coldfire="                       \
+       cobra5272               \
+       EB+MCF-EV123            \
+       EB+MCF-EV123_internal   \
+       idmr                    \
+       M5271EVB                \
+       M5272C3                 \
+       M5282EVB                \
 -      TASREG                  \
++      M5329EVB                \
+       r5200                   \
++      TASREG                  \
  "
  
  #########################################################################

diff --cc Makefile
index 69e7a6d57a7aab6d3613726579db79c167957d20,9dee9483c63ead629084dd484a587705216a75ee..92db8f494a2dc3dae5ac8fe531d168d86aeab8cc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -205,13 -206,15 +206,17 @@@ LIBS += disk/libdisk.
  LIBS += rtc/librtc.a
  LIBS += dtt/libdtt.a
  LIBS += drivers/libdrivers.a
+ 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 \

diff --cc README
Simple merge

diff --cc common/cmd_bdinfo.c
Simple merge

diff --cc common/cmd_mii.c
Simple merge

diff --cc include/common.h
Simple merge

diff --cc lib_m68k/board.c
index 1b515a4c59950833b8b8dadbd7c8d57435adf364,293fd04a4807c9be83a75abf764ae2ca7af22836..395018c41f9ab3d6562592ce727227d63779a3c1
--- 1/lib_m68k/board.c
--- 2/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@@ -221,7 -221,6 +221,7 @@@ static int init_func_i2c (void
   */
  
  init_fnc_t *init_sequence[] = {
-     get_clocks,
++      get_clocks,
        env_init,
        init_baudrate,
        serial_init,
@@@ -685,33 -640,15 +685,34 @@@ void board_init_r (gd_t *id, ulong dest
        nand_init();            /* go init the NAND */
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_NET)
 -#if defined(CONFIG_CMD_NET) && defined(FEC_ENET)
++#if defined(CONFIG_CMD_NET)
        WATCHDOG_RESET();
 +#if defined(FEC_ENET)
        eth_init(bd);
  #endif
-       eth_initialize (bd);
 +#if defined(CONFIG_NET_MULTI)
 +      puts ("Net:   ");
++        eth_initialize (bd);
 +#endif
 +#endif
  
  #ifdef CONFIG_POST
        post_run (NULL, POST_RAM | post_bootmode_get(0));
  #endif
  
- #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && !(CONFIG_COMMANDS & CFG_CMD_IDE)
++#if defined(CONFIG_CMD_PCMCIA) \
++    && !defined(CONFIG_CMD_IDE)
 +      WATCHDOG_RESET ();
 +      puts ("PCMCIA:");
 +      pcmcia_init ();
 +#endif
 +
- #if (CONFIG_COMMANDS & CFG_CMD_IDE)
++#if defined(CONFIG_CMD_IDE)
 +      WATCHDOG_RESET ();
 +      puts ("IDE:   ");
 +      ide_init ();
- #endif /* CFG_CMD_IDE */
++#endif
 +
  #ifdef CONFIG_LAST_STAGE_INIT
        WATCHDOG_RESET ();
        /*

diff --cc net/eth.c
Simple merge