From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sun, 3 Sep 2006 23:03:57 +0000 (+0200)
Subject: Merge with /home/m8/git/u-boot
X-Git-Tag: v2008.10-rc1~1121^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6741ae92f37caea8a22d1dcfaeab356f94b64676;p=platform%2Fkernel%2Fu-boot.git

Merge with /home/m8/git/u-boot
---

6741ae92f37caea8a22d1dcfaeab356f94b64676
diff --cc CHANGELOG
index 5743bbc,b2f2aa9..be18ac2
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,45 -2,32 +2,69 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
 -* Add support for a saving build objects in a separate directory.
 -  Modifications are based on the linux kernel approach and 
 -  support two use cases:
 -  
 -  1) Add O= to the make command line
 -  'make O=/tmp/build all'
++* Fix coldfire build problems.
++  Patch by Marian Balakowicz, 01 Sep 2006
+ 
++* Add support for a saving build objects in a separate directory.
++  Modifications are based on the Linux kernel approach and support
++  two use cases:
++  1) Add O= to the make command line 'make O=/tmp/build all'
+   2) Set environement variable BUILD_DIR to point to the desired location
 -  'export BUILD_DIR=/tmp/build'
 -  'make'
 -
++	'export BUILD_DIR=/tmp/build'
++	'make'
+   The second approach can also be used with a MAKEALL script
 -  'export BUILD_DIR=/tmp/build'
 -  './MAKEALL'
 - 
 -  Command line 'O=' setting overrides BUILD_DIR environent variable.
 - 
 -  When none of the above methods is used the local build is performed and
 -  the object files are placed in the source directory.
++	'export BUILD_DIR=/tmp/build'
++	'./MAKEALL'
++  Command line 'O=' setting overrides the BUILD_DIR environent variable.
++  When none of the above methods is used the local build is performed
++  and the object files are placed in the source directory.
+ 
+ * Remove the board/netstar/crcit binary from git repository.
+ 
+ * Fix tools/updater build error.
+ 
+ * Fix tools/easylogo build error.
+ 
++
 +* Fixed problems on PRS200 board caused by adding splash screen on MCC200
 +
 +* Extended README entry on coding style
 +
 +* Added another example showing simple interrupt interception.
 +
 +* Added simple_strtoul(), getenv() and setenv() to the exported functions.
 +  Also bumped up ABI version to reflect this change.
 +
 +* Added interrupt handling capabilities for mpc5xxx processors.
 +  Also added Linux like BUG() macros.
 +
 +* Coding Style cleanup.
 +  Patch by Stefano Babic, 31 Aug 2006
 +
 +* Add splashscreen support for MCC200 board.
 +
 +* Make the serial driver framework work with CONFIG_SERIAL_MULTI
 +  enabled
 +
 +* PCIe endpoint support for AMCC Yucca 440SPe board
 +  Patch by Tirumala R Marri, 26 Aug 2006
 +
 +* Improve DIMM detection for AMCC Yucca 440SPe board
 +  Improved the memory DIMM detection for the Yucca 440SPe board for
 +  the case where a memory DIMM is falsely detected as present.
 +  This issue is seen on some AMCC Yucca 440SPe validation boards if
 +  only one 512MB memory DIMM is installed, i.e. DIMM slot 0 is
 +  populated and DIMM slot 1 is empty.  In this case, U-Boot does
 +  not correctly detect that there is only one DIMM memory module
 +  installed and will falsely detect two DIMM memory modules are
 +  present and therefore U-Boot will not calculate the correct amount
 +  of total memory and u-boot will not booting up.
 +  Patch by Adam Graham, 24 Aug 2006
 +
 +* Fix typo.
 +
 +* Code cleanup
 +
  * Update for MCC200 / PRS200 boards:
    - auto-adjust console device for Linux.
    - fix typos.
diff --cc board/mcc200/Makefile
index bd75859,4b2bbe2..eb1d059
--- a/board/mcc200/Makefile
+++ b/board/mcc200/Makefile
@@@ -23,11 -23,15 +23,15 @@@
  
  include $(TOPDIR)/config.mk
  
- LIB	= lib$(BOARD).a
+ LIB	= $(obj)lib$(BOARD).a
  
- OBJS	:= $(BOARD).o lcd.o
 -COBJS	:= $(BOARD).o
++COBJS	:= $(BOARD).o lcd.o
  
- $(LIB):	$(OBJS) $(SOBJS)
+ SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+ OBJS	:= $(addprefix $(obj),$(COBJS))
+ SOBJS	:= $(addprefix $(obj),$(SOBJS))
+ 
+ $(LIB):	$(obj).depend $(OBJS)
  	$(AR) crv $@ $(OBJS)
  
  clean:
diff --cc cpu/mcf52x2/fec.c
index 6db6214,6db6214..b6540b5
--- a/cpu/mcf52x2/fec.c
+++ b/cpu/mcf52x2/fec.c
@@@ -267,6 -267,6 +267,7 @@@ int eth_init (bd_t * bd
  	fecp->fec_hash_table_high = 0;
  	fecp->fec_hash_table_low = 0;
  #endif
++#endif
  
  	/* Set maximum receive buffer size.
  	 */
diff --cc cpu/mcf52x2/start.S
index 8a83ca5,8a83ca5..f1f4077
--- a/cpu/mcf52x2/start.S
+++ b/cpu/mcf52x2/start.S
@@@ -140,6 -140,6 +140,7 @@@ _start
  	move.l	#(CFG_MBAR + 1), %d0		/* set IPSBAR address + valid flag */
  	move.l	%d0, 0x40000000
  
++#if defined(CONFIG_M5282)
  	/* Initialize RAMBAR1: locate SRAM and validate it */
  	move.l	#(CFG_INIT_RAM_ADDR + 0x21), %d0
  	movec	%d0, %RAMBAR1
@@@ -171,6 -171,6 +172,7 @@@ _after_flashbar_copy
  #endif /* (TEXT_BASE == CFG_INT_FLASH_BASE) */
  
  #endif
++#endif
  	/* if we come from a pre-loader we have no exception table and
  	 * therefore no VBR to set
  	 */