Merge with /home/wd/git/u-boot/master

diff --cc CHANGELOG
index 63d327ab18efd6b2006dab8e87059af01f997598,b5ee677edd034cefefae422ce9112af051c4c9be..449db66fd4b962c0fa8a10b3d474628ead89e695
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,18 -2,56 +2,68 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
 +* Various USB related patches 
 +  - Add support for mpc8xx USB device.
 +  - Add support for Common Device Class - Abstract Control Model USB console.
 +  - Add support for flow control in USB slave devices.
 +  - Add support for switching between gserial and cdc_acm using environment.
 +  - Minor changes to usbdcore_omap1510.c usbdcore_omap1510.h
 +  - Update usbcore slightly to ease host enumeration.
 +  - Fix non-portable endian problems in usbdcore and usbdcore_ep0.
 +  - Add AdderUSB_config as a defconfig to enable usage of the USB console
 +    by default with the Adder87x U-Boot port.
 +  Patch by Bryan O'Donoghue <bodonoghue@codehermit.ie>, 29 May 2006
 +
+ * Fix IxEthDB.h to compile again
+   Patch by Stefan Roese, 14 Jun 2006
+ 
+ * Minor cleanup for PCS440EP board
+   Patch by Stefan Roese, 13 Jun 2006
+ 
+ * Add MCF5282 support (without preloader)
+   relocate ichache_State to ram
+   u-boot can run from internal flash
+   Add EB+MCF-EV123 board support.
+   Add m68k Boards to MAKEALL
+   Patch from Jens Scharsig, 08 Aug 2005
+ 
+ * Nios II - Add Altera EP1C20, EP1S10 and EP1S40 boards
+   Patch by Scott McNutt, 08 Jun 2006
+ 
+ * Nios II - Add EPCS Controller bootrom work-around
+   -When booting from an epcs controller, the epcs bootrom may leave the
+   slave select in an asserted state causing soft reset hang. This
+   patch ensures slave select is negated at reset.
+   Patch by Scott McNutt, 08 Jun 2006
+ 
+ * Update PK1C20 board
+   -Update base addresses for standard configuration
+   -Eliminate use of CACHE_BYPASS in board code
+   Patch by Scott McNutt, 08 Jun 2006
+ 
+ * Nios II - Fix I/O Macros and mini-app stubs
+   -Fix asm/io.h macros
+   -Eliminate use of CACHE_BYPASS in cpu code
+   -Eliminate assembler warnings
+   -Fix mini-app stubs and force no small data
+   Patch by Scott McNutt, 08 Jun 2006
+ 
+ * Fix U-Boot environment sector protection on MCC200 board
+ 
+ * Minor cleanup for PCS440EP board
+ 
+ * Update PCS440EP port to fit into one flash device (incl. environment)
+   Patch by Stefan Roese, 06 Jun 2006
+ 
+ * Add support for PCS440EP board
+   Patch by Stefan Roese, 02 Jun 2006
+ 
+ * Fix examples/Makefile; some build targets were lost
+ 
+ * Fix watchdog handling in CFI flash driver
+   Just use udelay() when waiting for status changes which will
+   implicitely trigger the watchdog.
+ 
  * Fix PCI to memory window size problems on PM82x boards
    We use the "automatic" mode that was used for  the  MPC8266ADS  and
    MPC8272 boards. Eventually this should be used on all boards?]

diff --cc Makefile
Simple merge

diff --cc README
Simple merge