Coding style cleanup. Update CHANGELOG.

[karo-tx-uboot.git] / include / image.h

diff --git a/include/image.h b/include/image.h
index 9c6f95b054c224124e4e22b87e55ddeddb3ee4b3..2f575fd2d76f98f5d3ba977e4fc9d0da6fc7d7d2 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -19,6 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef __IMAGE_H__
@@ -64,7 +71,12 @@
 #define IH_CPU_SH              9       /* SuperH       */
 #define IH_CPU_SPARC           10      /* Sparc        */
 #define IH_CPU_SPARC64         11      /* Sparc 64 Bit */
-#define        IH_CPU_M68K             12      /* M68K         */
+#define IH_CPU_M68K            12      /* M68K         */
+#define IH_CPU_NIOS            13      /* Nios-32      */
+#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
@@ -93,7 +105,7 @@
  *     byte order. This list is terminated by an "(uint32_t)0".
  *     Immediately after the terminating 0 follow the images, one by
  *     one, all aligned on "uint32_t" boundaries (size rounded up to
- *     a multiple of 4 bytes).
+ *     a multiple of 4 bytes - except for the last file).
  *
  * "Firmware Images" are binary images containing firmware (like
  *     U-Boot or FPGA images) which usually will be programmed to
@@ -113,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
@@ -124,11 +137,6 @@
 #define IH_MAGIC       0x27051956      /* Image Magic Number           */
 #define IH_NMLEN               32      /* Image Name Length            */
 
-#ifdef __CYGWIN__
-typedef unsigned long uint32_t;
-typedef unsigned char uint8_t;
-#endif /* __CYGWIN__ */
-
 /*
  * all data in network byte order (aka natural aka bigendian)
  */