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

diff --cc CHANGELOG
index 5743bbc39272a69148fed4a7dfcf279f2709fce8,b2f2aa9c921a749af51e6c3acee95d4a63c5c1ca..be18ac206c12a0b2407239cf288962f6a3c1ed66
--- 1/CHANGELOG
--- 2/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 bd75859f61553b2f9d88fa4847f1462e2008391b,4b2bbe27d20d536a6b91e90ae0a328f623515dde..eb1d059ae913d222675cf37df4c16d6e36e5050a
--- 1/board/mcc200/Makefile
--- 2/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 6db621472206e0dcb5af25c5c73c523337176f14,6db621472206e0dcb5af25c5c73c523337176f14..b6540b55af69a3190541adc616ac4c6a27b4f1b1
--- 1/cpu/mcf52x2/fec.c
--- 2/cpu/mcf52x2/fec.c
+++ b/cpu/mcf52x2/fec.c
@@@ -266,6 -266,6 +266,7 @@@ int eth_init (bd_t * bd
  #else
        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 8a83ca5ef7dd933b0ec0e8185892eabb86fcd558,8a83ca5ef7dd933b0ec0e8185892eabb86fcd558..f1f4077ebca48fa2aed98c1c0295c7af1e899dd8
--- 1/cpu/mcf52x2/start.S
--- 2/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
@@@ -170,6 -170,6 +171,7 @@@ _after_flashbar_copy
        movec   %d0, %RAMBAR0
  #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

diff --cc examples/Makefile
Simple merge