From: Stefan Roese <sr@denx.de>
Date: Wed, 15 Aug 2007 12:51:27 +0000 (+0200)
Subject: Merge with git://www.denx.de/git/u-boot.git
X-Git-Tag: v1.3.0-rc1~19^2~2^2~17^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d61ea14885631e58a25feaa81ee82eb464c62d6a;p=u-boot

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

d61ea14885631e58a25feaa81ee82eb464c62d6a
diff --cc MAKEALL
index 2cdf10c28d,1219fb373f..4775cfeee7
--- a/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 69e7a6d57a,9dee9483c6..92db8f494a
--- a/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 lib_m68k/board.c
index 1b515a4c59,293fd04a48..395018c41f
--- a/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
 +#if defined(CONFIG_NET_MULTI)
 +	puts ("Net:   ");
- 	eth_initialize (bd);
++        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 ();
  	/*