From: Wolfgang Denk <wd@pollux.denx.de>
Date: Sat, 1 Apr 2006 13:52:46 +0000 (+0200)
Subject: * Add support for ymodem protocol download
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=534ff676a9c2ffd460e096754894e78551e4ed1e

* 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
---

534ff676a9c2ffd460e096754894e78551e4ed1e
diff --cc CHANGELOG
index a1b52502ab,34b8d20ebb..fdb6aae5e5
--- a/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 common/cmd_load.c
index b18709a47f,54460cdcc3..31fef8151b
--- a/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);