commit 343c9d1456916ff3823794afedf2182debd19d7e
author Wolfgang Denk <wd@denx.de> Mon Sep 10 23:21:16 2007 +0200
committer Wolfgang Denk <wd@denx.de> Mon Sep 10 23:21:16 2007 +0200
tree b567826f38444f928051f4c9f9a5c600751134c5
parent 72908ab40a658c4e3a2aa962fe3b4130beed9010
parent 9425b96ac417863b118bee564d4fa9b0aa939ee3

Merge with /home/raj/git/u-boot#ads5121_fec_optimize

Makefile

diff --git a/Makefile b/Makefile
index 0371d46..c1c6446 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@
 #
 
 VERSION = 1
-PATCHLEVEL = 2
+PATCHLEVEL = 3
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc1
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h
 

include/image.h

diff --git a/include/image.h b/include/image.h
index 2f575fd..432fa22 100644
--- a/include/image.h
+++ b/include/image.h
@@ -77,6 +77,7 @@
 #define IH_CPU_NIOS2		15	/* Nios-II	*/
 #define IH_CPU_BLACKFIN		16	/* Blackfin	*/
 #define IH_CPU_AVR32		17	/* AVR32	*/
+#define IH_CPU_ST200	        18	/* STMicroelectronics ST200  */
 
 /*
  * Image Types