From: Wolfgang Denk <wd@nyx.denx.de>
Date: Mon, 9 Oct 2006 11:32:53 +0000 (+0200)
Subject: Merge with /home/sr/git/u-boot/avr32
X-Git-Tag: U-Boot-1_1_5~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f;p=oweals%2Fu-boot.git

Merge with /home/sr/git/u-boot/avr32
---

a3bb7bfc06a9ccb7e2f91ccc54a90ae69177214f
diff --cc CHANGELOG
index 9486f0d3f2,e3ab62138d..a2ea35d68e
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,9 -2,11 +2,14 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Define IH_CPU_AVR32
+   Make it possible to generate AVR32 uImage files with mkimage and
+   make cmd_bootm recognize them.
+   Patch by Haavard Skinnemoen, 22 Sep 2006
+ 
 +* Fix buffer overflow problem in ft_build.c
 +  Patch by Fredrik Roubert, 09 Oct 2006
 +
  * Make bootp implementation RFC3046 compliant
    Patch by Joakim Larsson, 27 Jun 2006