Module Name: src
Committed By: jmcneill
Date: Fri Sep 29 21:18:28 UTC 2017
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.1 mkubootimage.c uboot.h
Log Message:
add sh arch
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/mkubootimage/mkubootimage.1
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r1.7 -r1.8 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.1
diff -u src/usr.bin/mkubootimage/mkubootimage.1:1.10 src/usr.bin/mkubootimage/mkubootimage.1:1.11
--- src/usr.bin/mkubootimage/mkubootimage.1:1.10 Sat Jul 15 12:10:31 2017
+++ src/usr.bin/mkubootimage/mkubootimage.1 Fri Sep 29 21:18:28 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkubootimage.1,v 1.10 2017/07/15 12:10:31 wiz Exp $
+.\" $NetBSD: mkubootimage.1,v 1.11 2017/09/29 21:18:28 jmcneill Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 15, 2017
+.Dd September 29, 2017
.Dt MKUBOOTIMAGE 1
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl h
-.Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc )
+.Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns sh )
.Fl a Ar address
.Op Fl C Po bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Pc
.Op Fl E Ar address
@@ -55,7 +55,7 @@ utility is used to create an image for D
.Pp
The arguments are as follows:
.Bl -tag -width indent
-.It Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc )
+.It Fl A No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns sh )
Defines the architecture.
This is required.
.It Fl a Ar address
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.20 src/usr.bin/mkubootimage/mkubootimage.c:1.21
--- src/usr.bin/mkubootimage/mkubootimage.c:1.20 Sat Jul 15 11:13:08 2017
+++ src/usr.bin/mkubootimage/mkubootimage.c Fri Sep 29 21:18:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.20 2017/07/15 11:13:08 jmcneill Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.21 2017/09/29 21:18:28 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.20 2017/07/15 11:13:08 jmcneill Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.21 2017/09/29 21:18:28 jmcneill Exp $");
#include <sys/mman.h>
#include <sys/stat.h>
@@ -106,12 +106,13 @@ static const struct uboot_arch {
const char *name;
} uboot_arch[] = {
{ IH_ARCH_ARM, "arm" },
+ { IH_ARCH_ARM64, "arm64" },
{ IH_ARCH_I386, "i386" },
{ IH_ARCH_MIPS, "mips" },
{ IH_ARCH_MIPS64, "mips64" },
{ IH_ARCH_PPC, "powerpc" },
{ IH_ARCH_OPENRISC, "or1k" },
- { IH_ARCH_ARM64, "arm64" },
+ { IH_ARCH_SH, "sh" },
};
static enum uboot_image_arch
@@ -219,7 +220,7 @@ __dead static void
usage(void)
{
fprintf(stderr, "usage: mkubootimage -A "
- "<arm|arm64|i386|mips|mips64|or1k|powerpc>");
+ "<arm|arm64|i386|mips|mips64|or1k|powerpc|sh>");
fprintf(stderr, " -C <none|bz2|gz|lzma|lzo>");
fprintf(stderr, " -O <openbsd|netbsd|freebsd|linux>");
fprintf(stderr, " -T <standalone|kernel|kernel_noload|ramdisk|fs|script>");
Index: src/usr.bin/mkubootimage/uboot.h
diff -u src/usr.bin/mkubootimage/uboot.h:1.7 src/usr.bin/mkubootimage/uboot.h:1.8
--- src/usr.bin/mkubootimage/uboot.h:1.7 Sat Jul 15 11:13:08 2017
+++ src/usr.bin/mkubootimage/uboot.h Fri Sep 29 21:18:28 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.h,v 1.7 2017/07/15 11:13:08 jmcneill Exp $ */
+/* $NetBSD: uboot.h,v 1.8 2017/09/29 21:18:28 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <[email protected]>
@@ -43,6 +43,7 @@ enum uboot_image_arch {
IH_ARCH_MIPS = 5,
IH_ARCH_MIPS64 = 6,
IH_ARCH_PPC = 7,
+ IH_ARCH_SH = 9,
IH_ARCH_OPENRISC = 21,
IH_ARCH_ARM64 = 22
};
