* Add support for ymodem protocol download

  Patch by Stefano Babic, 29 Mar 2006

* Memory Map Update for Delta board: U-Boot is at 0x80000000-0x84000000

Merge with /home/mk/8-benq/u-boot

diff --cc CHANGELOG
index a1b52502abbc93d8bdc2975e448cec13bf34ccc5,34b8d20ebb68835cd9cc2589a8ad60d56e8a29c3..fdb6aae5e5f478405be348692e9ef004562f42c5
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,19 -2,6 +2,25 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
++* Add support for ymodem protocol download
++  Patch by Stefano Babic, 29 Mar 2006
++
++* Memory Map Update for Delta board: U-Boot is at 0x80000000-0x84000000
++  Merge from Markus Klotzbücher's repo, 01 Apr 2006
++
 +* GCC-4.x fixes: clean up global data pointer initialization for all
 +  boards
 +
 +* Update for Delta board:
 +  - redundant NAND environment
 +  - misc Monahans cleanups (remove dead code etc.)
 +  - DA9030 Initialization; some minimal changes to PXA I2C driver to
 +    make it work with the Monahans.
 +  - Make Monahans clock frequency configurable using
 +    CFG_MONAHANS_RUN_MODE_OSC_RATIO and
 +    CFG_MONAHANS_TURBO_RUN_MODE_RATIO.
 +  Merge from Markus Klotzbücher's repo, 25 Mar 2006
 +
  * Enable Quad UART om MCC200 board.
  
  * Cleanup MCC200 board configuration; omit non-existent stuff.

diff --cc board/delta/delta.c
Simple merge

diff --cc common/cmd_load.c
index b18709a47f594bedabe827c104c88791250a33d6,54460cdcc3386ef2ff2a0eed7ef0bc419eaa7603..31fef8151b76da3b5750a24c26cf6dc017c856bc
--- 1/common/cmd_load.c
--- 2/common/cmd_load.c
+++ b/common/cmd_load.c
@@@ -29,11 -29,11 +29,13 @@@
  #include <s_record.h>
  #include <net.h>
  #include <exports.h>
+ #include <xyzModem.h>
  
 +DECLARE_GLOBAL_DATA_PTR;
 +
  #if (CONFIG_COMMANDS & CFG_CMD_LOADS)
  static ulong load_serial (ulong offset);
+ static ulong load_serial_ymodem (ulong offset);
  static int read_record (char *buf, ulong len);
  # if (CONFIG_COMMANDS & CFG_CMD_SAVES)
  static int save_serial (ulong offset, ulong size);