Module Name: src
Committed By: matt
Date: Wed Aug 3 17:46:40 UTC 2011
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.c uboot.h
Log Message:
Add lzma and lzo compression types
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/mkubootimage/uboot.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.9 src/usr.bin/mkubootimage/mkubootimage.c:1.10
--- src/usr.bin/mkubootimage/mkubootimage.c:1.9 Wed Aug 3 17:00:13 2011
+++ src/usr.bin/mkubootimage/mkubootimage.c Wed Aug 3 17:46:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.9 2011/08/03 17:00:13 matt Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.10 2011/08/03 17:46:40 matt Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.9 2011/08/03 17:00:13 matt Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.10 2011/08/03 17:46:40 matt Exp $");
#include <sys/mman.h>
#include <sys/stat.h>
@@ -178,6 +178,8 @@
{ IH_COMP_NONE, "none" },
{ IH_COMP_GZIP, "gz" },
{ IH_COMP_BZIP2, "bz2" },
+ { IH_COMP_LZMA, "lzma" },
+ { IH_COMP_LZO, "lzo" },
};
static enum uboot_image_comp
Index: src/usr.bin/mkubootimage/uboot.h
diff -u src/usr.bin/mkubootimage/uboot.h:1.3 src/usr.bin/mkubootimage/uboot.h:1.4
--- src/usr.bin/mkubootimage/uboot.h:1.3 Sat Feb 26 20:03:09 2011
+++ src/usr.bin/mkubootimage/uboot.h Wed Aug 3 17:46:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.h,v 1.3 2011/02/26 20:03:09 phx Exp $ */
+/* $NetBSD: uboot.h,v 1.4 2011/08/03 17:46:40 matt Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -56,6 +56,8 @@
IH_COMP_NONE = 0,
IH_COMP_GZIP = 1,
IH_COMP_BZIP2 = 2,
+ IH_COMP_LZMA = 3,
+ IH_COMP_LZO = 4,
};
#define IH_MAGIC 0x27051956