 @@ -1,14 +1,14 @@
-.\"	$NetBSD: mkubootimage.1,v 1.13 2019/12/04 11:21:34 jmcneill Exp $
+.\"	$NetBSD: mkubootimage.1,v 1.14 2019/12/07 12:34:17 wiz Exp $
 .\"
 .\" Copyright (c) 2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Jeremy C. Reed
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 @@ -25,51 +25,50 @@
 .\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd December 4, 2019
 .Dt MKUBOOTIMAGE 1
 .Os
 .Sh NAME
 .Nm mkubootimage
 .Nd create U-Boot loader image
 .Sh SYNOPSIS
 .Nm
-.Op Fl h
+.Op Fl hu
 .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
 .Op Fl e Ar address
 .Op Fl f Po arm64 Ns | Ns uimg Pc
 .Op Fl m Ar magic
 .Fl n Ar image
 .Op Fl O Po freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd Pc
-.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns standalone )
+.Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
 .Op Fl u
 .Ar source destination
 .\"
 .Sh DESCRIPTION
 The
 .Nm
 utility is used to create an image for Das U-Boot, the
 .Qq Universal Boot Loader .
 .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 Ns | Ns sh )
 Defines the architecture.
 This is required for
 .Qq uimg
 format images.
 .It Fl a Ar address
 Sets the image load address.
 This is an integer between 0 and
 .Dv UINT32_MAX .
 This is required for all
 .Qq uimg
 image types except for script, ramdisk, and kernel_noload.
 .It Fl C No ( bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none )
 Defines the compression.
 The default is
 .Qq none .
 @@ -110,27 +109,27 @@ Set the magic used for
 .Qq uimg
 format images.
 This is an integer between 0 and
 .Dv UINT32_MAX .
 The default is
 .Qq 0x27051956 .
 .It Fl n Ar image
 Defines the image name.
 This is required.
 .It Fl O No ( freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd )
 Defines the operating system type.
 The default OS name is
 .Qq netbsd .
-.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns standalone Ns | Ns script )
+.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
 Defines the image type.
 This is required for
 .Qq uimg
 format images.
 .It Fl u
 Update the header in an existing file instead of creating a new one.
 .El
 .Pp
 The required
 .Ar source
 argument is the filename of the kernel that is read.
 The required
 .Ar destination

 @@ -1,14 +1,14 @@
-/* $NetBSD: mkubootimage.c,v 1.26 2019/12/04 14:09:47 jmcneill Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $ */
 /*-
  * Copyright (c) 2010 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
 @@ -20,27 +20,27 @@
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.26 2019/12/04 14:09:47 jmcneill Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.27 2019/12/07 12:34:17 wiz Exp $");
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 @@ -254,34 +254,32 @@ get_comp_name(enum uboot_image_comp comp
 	unsigned int i;
 	for (i = 0; i < __arraycount(uboot_comp); i++) {
 		if (uboot_comp[i].comp == comp)
 			return uboot_comp[i].name;
+	}
 	return "Unknown";
+}
 __dead static void
 usage(void)
+{
-	fprintf(stderr, "usage: mkubootimage -A "
+	fprintf(stderr, "usage: mkubootimage [-hu] -A "
-	    "<arm|arm64|i386|mips|mips64|or1k|powerpc|sh>");
+	    "<arm|arm64|i386|mips|mips64|or1k|powerpc|sh> -a address\n");
-	fprintf(stderr, " -C <none|bz2|gz|lzma|lzo>");
+	fprintf(stderr, "\t-C <bz2|gz|lzma|lzo|none> [-E address] [-e address]\n");
-	fprintf(stderr, " -O <openbsd|netbsd|freebsd|linux>");
+	fprintf(stderr, "\t[-f <arm64|uimg>] [-m magic] -n image -O <freebsd|linux|netbsd|openbsd>\n");
-	fprintf(stderr, " -T <standalone|kernel|kernel_noload|ramdisk|fs|script>");
+	fprintf(stderr, "\t-T <fs|kernel|kernel_noload|ramdisk|script|standalone>\n");
-	fprintf(stderr, " -a <addr> [-e <ep>] [-m <magic>] -n <name>");
+	fprintf(stderr, "\tsource destination\n");
 	fprintf(stderr, " [-f <uimg|arm64>] [-u]");
 	fprintf(stderr, " <srcfile> <dstfile>\n");
 	exit(EXIT_FAILURE);
+}
 static void
 dump_header_uimg(struct uboot_image_header *hdr)
+{
 	time_t tm = ntohl(hdr->ih_time);
 	printf(" magic:       0x%08x\n", ntohl(hdr->ih_magic));
 	printf(" time:        %s", ctime(&tm));
 	printf(" size:        %u\n", ntohl(hdr->ih_size));
 	printf(" load addr:   0x%08x\n", ntohl(hdr->ih_load));