Merge branch 'master' into next

[u-boot] / include / image.h

diff --git a/include/image.h b/include/image.h
index 04b62d154fe2555749c8c13680320d7bd6857458..d2e78fe298376aa17b442d7891ac990ab3c35cb4 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -164,6 +164,7 @@
 #define IH_COMP_GZIP           1       /* gzip  Compression Used       */
 #define IH_COMP_BZIP2          2       /* bzip2 Compression Used       */
 #define IH_COMP_LZMA           3       /* lzma  Compression Used       */
+#define IH_COMP_LZO            4       /* lzo   Compression Used       */
 
 #define IH_MAGIC       0x27051956      /* Image Magic Number           */
 #define IH_NMLEN               32      /* Image Name Length            */