aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-26 01:55:00 +0200
committerWolfgang Denk <wd@denx.de>2008-04-26 01:55:00 +0200
commitfd7531c1e9d56b9e5e06d2c0e02b798dab72f70c (patch)
tree20230ae272e61475008878b03eb79bd0c1d17b8d
parent19cf2ec90d8ce52da60c1693693c4048cb810967 (diff)
downloadu-boot-linaro-natty-fd7531c1e9d56b9e5e06d2c0e02b798dab72f70c.tar.gz
Prepare v1.3.3-rc1v1.3.3-rc1
Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--CHANGELOG19
-rw-r--r--Makefile4
2 files changed, 21 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 64adef905..82fd6f8ec 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,22 @@
+commit 19cf2ec90d8ce52da60c1693693c4048cb810967
+Author: Wolfgang Denk <wd@denx.de>
+Date: Sat Apr 26 01:25:39 2008 +0200
+
+ post/Makefile: make sure to use the correct flags
+
+ ARFLAGS was not set, which caused "ppc_8xx-ar: creating libgenpost.a"
+ messages to be printed.
+
+ Signed-off-by: Wolfgang Denk <wd@denx.de>
+
+commit 7ed4011733e7dca8f64d21291e4294662f7dc3e2
+Author: Wolfgang Denk <wd@denx.de>
+Date: Sat Apr 26 00:34:42 2008 +0200
+
+ Coding Style cleanup, update CHANGELOG
+
+ Signed-off-by: Wolfgang Denk <wd@denx.de>
+
commit f9204e15173834ff8d123e36279ce49c3c6c74fc
Author: Magnus Lilja <lilja.magnus@gmail.com>
Date: Sun Apr 20 10:38:12 2008 +0200
diff --git a/Makefile b/Makefile
index 86e44d045..4688a26d1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@
VERSION = 1
PATCHLEVEL = 3
-SUBLEVEL = 2
-EXTRAVERSION =
+SUBLEVEL = 3
+EXTRAVERSION = -rc1
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h