Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[u-boot] / Makefile

diff --git a/Makefile b/Makefile
index 2e6dca36406a75e5a112576df74e5b68b52c370a..e8bbd7808e33d30dee50005363aea6eb0f05f370 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,15 @@
 # MA 02111-1307 USA
 #
 
-VERSION = 1
-PATCHLEVEL = 3
-SUBLEVEL = 4
-EXTRAVERSION =
+VERSION = 2008
+PATCHLEVEL = 10
+SUBLEVEL =
+EXTRAVERSION = -rc1
+ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+else
+U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL)$(EXTRAVERSION)
+endif
 VERSION_FILE = $(obj)include/version_autogenerated.h
 
 HOSTARCH := $(shell uname -m | \