CVS commit: src/usr.bin/mkubootimage

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Mon Jan 31 03:37:29 UTC 2011

Modified Files:
        src/usr.bin/mkubootimage: mkubootimage.c uboot.h

Log Message:
Add mips/mips64 support.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r1.1 -r1.2 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.4 src/usr.bin/mkubootimage/mkubootimage.c:1.5
--- src/usr.bin/mkubootimage/mkubootimage.c:1.4	Sat Jul 10 07:48:25 2010
+++ src/usr.bin/mkubootimage/mkubootimage.c	Mon Jan 31 03:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.4 2010/07/10 07:48:25 kiyohara Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.5 2011/01/31 03:37:28 matt Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.4 2010/07/10 07:48:25 kiyohara Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.5 2011/01/31 03:37:28 matt Exp $");
 
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -65,6 +65,8 @@
 	const char *name;
 } uboot_arch[] = {
 	{ IH_ARCH_ARM,		"arm" },
+	{ IH_ARCH_MIPS,		"mips" },
+	{ IH_ARCH_MIPS64,	"mips64" },
 	{ IH_ARCH_PPC,		"powerpc" },
 };
 
@@ -128,7 +130,7 @@
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: mkubootimage -A <arm|powerpc>");
+	fprintf(stderr, "usage: mkubootimage -A <arm|mips|mips64|powerpc>");
 	fprintf(stderr, " -T <kernel|ramdisk|fs>");
 	fprintf(stderr, " -C <none|gz|bz2>");
 	fprintf(stderr, " -a <addr> [-e <ep>] -n <name>");

Index: src/usr.bin/mkubootimage/uboot.h
diff -u src/usr.bin/mkubootimage/uboot.h:1.1 src/usr.bin/mkubootimage/uboot.h:1.2
--- src/usr.bin/mkubootimage/uboot.h:1.1	Fri Jun 18 18:55:48 2010
+++ src/usr.bin/mkubootimage/uboot.h	Mon Jan 31 03:37:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.h,v 1.1 2010/06/18 18:55:48 jmcneill Exp $ */
+/* $NetBSD: uboot.h,v 1.2 2011/01/31 03:37:28 matt Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -33,6 +33,8 @@
 enum uboot_image_arch {
 	IH_ARCH_UNKNOWN = 0,
 	IH_ARCH_ARM = 2,
+	IH_ARCH_MIPS = 5,
+	IH_ARCH_MIPS64 = 6,
 	IH_ARCH_PPC = 7
 };