[src/trunk]: src/usr.bin/mkubootimage add sh arch

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/276eec6d5d29
branches:  trunk
changeset: 356494:276eec6d5d29
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Sep 29 21:18:28 2017 +0000

description:
add sh arch

diffstat:

 usr.bin/mkubootimage/mkubootimage.1 |  8 ++++----
 usr.bin/mkubootimage/mkubootimage.c |  9 +++++----
 usr.bin/mkubootimage/uboot.h        |  3 ++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (95 lines):

diff -r 7d6128ca7a7d -r 276eec6d5d29 usr.bin/mkubootimage/mkubootimage.1
--- a/usr.bin/mkubootimage/mkubootimage.1       Fri Sep 29 17:53:57 2017 +0000
+++ b/usr.bin/mkubootimage/mkubootimage.1       Fri Sep 29 21:18:28 2017 +0000
@@ -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 @@
 .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
diff -r 7d6128ca7a7d -r 276eec6d5d29 usr.bin/mkubootimage/mkubootimage.c
--- a/usr.bin/mkubootimage/mkubootimage.c       Fri Sep 29 17:53:57 2017 +0000
+++ b/usr.bin/mkubootimage/mkubootimage.c       Fri Sep 29 21:18:28 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        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 @@
 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>");
diff -r 7d6128ca7a7d -r 276eec6d5d29 usr.bin/mkubootimage/uboot.h
--- a/usr.bin/mkubootimage/uboot.h      Fri Sep 29 17:53:57 2017 +0000
+++ b/usr.bin/mkubootimage/uboot.h      Fri Sep 29 21:18:28 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -43,6 +43,7 @@
        IH_ARCH_MIPS = 5,
        IH_ARCH_MIPS64 = 6,
        IH_ARCH_PPC = 7,
+       IH_ARCH_SH = 9,
        IH_ARCH_OPENRISC = 21,
        IH_ARCH_ARM64 = 22
 };