Merge branch 'master' of http://www.denx.de/git/u-boot

[u-boot] / include / image.h

diff --git a/include/image.h b/include/image.h
index 139df0b2d1e783b836a81689a053071bd290f1a8..2f575fd2d76f98f5d3ba977e4fc9d0da6fc7d7d2 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -76,6 +76,7 @@
 #define IH_CPU_MICROBLAZE      14      /* MicroBlaze   */
 #define IH_CPU_NIOS2           15      /* Nios-II      */
 #define IH_CPU_BLACKFIN                16      /* Blackfin     */
+#define IH_CPU_AVR32           17      /* AVR32        */
 
 /*
  * Image Types
@@ -124,6 +125,7 @@
 #define IH_TYPE_FIRMWARE       5       /* Firmware Image               */
 #define IH_TYPE_SCRIPT         6       /* Script file                  */
 #define IH_TYPE_FILESYSTEM     7       /* Filesystem Image (any type)  */
+#define IH_TYPE_FLATDT         8       /* Binary Flat Device Tree Blob */
 
 /*
  * Compression Types