summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-02-15 00:59:03 +0100
committerWolfgang Denk <wd@denx.de>2008-02-15 00:59:03 +0100
commit45da195cf675d0b4054aeeabf7b9c0daf798841d (patch)
tree96c0226559e468d00d667e835e0a4c0d25a97015 /Makefile
parent94a78da26ce17af61fbb2b620de51ba79bc80597 (diff)
parent67a4389e39ad853d65b72e2b7cad15c7e8291147 (diff)
downloadu-boot-imx-45da195cf675d0b4054aeeabf7b9c0daf798841d.zip
u-boot-imx-45da195cf675d0b4054aeeabf7b9c0daf798841d.tar.gz
u-boot-imx-45da195cf675d0b4054aeeabf7b9c0daf798841d.tar.bz2
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 38ade50..9512b71 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@
VERSION = 1
PATCHLEVEL = 3
-SUBLEVEL = 1
-EXTRAVERSION =
+SUBLEVEL = 2
+EXTRAVERSION = -rc1
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h