diff --git a/usr.bin/mkubootimage/mkubootimage.1 b/usr.bin/mkubootimage/mkubootimage.1 index 6ee9c16b92b1..4de9d5c69d4e 100644 --- a/usr.bin/mkubootimage/mkubootimage.1 +++ b/usr.bin/mkubootimage/mkubootimage.1 @@ -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 Das U-Boot, the .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 --git a/usr.bin/mkubootimage/mkubootimage.c b/usr.bin/mkubootimage/mkubootimage.c index 65ac1724a75a..6d29c094e6e5 100644 --- a/usr.bin/mkubootimage/mkubootimage.c +++ b/usr.bin/mkubootimage/mkubootimage.c @@ -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 @@ -30,7 +30,7 @@ #endif #include -__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 #include @@ -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 " - ""); + ""); fprintf(stderr, " -C "); fprintf(stderr, " -O "); fprintf(stderr, " -T "); diff --git a/usr.bin/mkubootimage/uboot.h b/usr.bin/mkubootimage/uboot.h index b33a25f5658f..ec2423e31ff8 100644 --- a/usr.bin/mkubootimage/uboot.h +++ b/usr.bin/mkubootimage/uboot.h @@ -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 @@ -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 };