summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMarkus Klotzbücher <mk@pollux.(none)>2006-02-24 14:16:31 +0100
committerMarkus Klotzbücher <mk@pollux.(none)>2006-02-24 14:16:31 +0100
commit0377dca227cc883bbaacbe1c442cef5bd6b0e121 (patch)
tree6c11795538a28ebd3ddb2389510e91d80c6ef1eb /CHANGELOG
parent7d4d1ce48c849ec5a7e034fd4bc4d0e624075e7b (diff)
parent038ccac511214b062c56f22b9413f784b86bcd87 (diff)
downloadu-boot-imx-0377dca227cc883bbaacbe1c442cef5bd6b0e121.zip
u-boot-imx-0377dca227cc883bbaacbe1c442cef5bd6b0e121.tar.gz
u-boot-imx-0377dca227cc883bbaacbe1c442cef5bd6b0e121.tar.bz2
Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a4b0700..fba2d00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,11 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Merge the new NAND code (testing-NAND brach)
+
+ Rewrite of NAND code based on what is in 2.6.12 Linux kernel
+ Patch by Ladislav Michl, 29 Jun 2005
+
* Add basic support for the SMMACO4 Board from PanDaCom.
Patch by Heiko Schocher, 20 Feb 2006