[src/netbsd-8]: src/usr.bin/mkubootimage Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/39221336e9ad
branches:  netbsd-8
changeset: 434081:39221336e9ad
user:      snj <snj%NetBSD.org@localhost>
date:      Wed Jul 05 20:15:33 2017 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #96):
        usr.bin/mkubootimage/mkubootimage.c: revision 1.19
Load address is not required for "ramdisk" images.

diffstat:

 usr.bin/mkubootimage/mkubootimage.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r a9db399a42f3 -r 39221336e9ad usr.bin/mkubootimage/mkubootimage.c
--- a/usr.bin/mkubootimage/mkubootimage.c       Wed Jul 05 20:13:36 2017 +0000
+++ b/usr.bin/mkubootimage/mkubootimage.c       Wed Jul 05 20:15:33 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.18 2014/09/30 10:21:50 msaitoh Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.18.8.1 2017/07/05 20:15:33 snj 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.18 2014/09/30 10:21:50 msaitoh Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.18.8.1 2017/07/05 20:15:33 snj Exp $");
 
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -429,7 +429,8 @@
 
        if (image_arch == IH_ARCH_UNKNOWN ||
            image_type == IH_TYPE_UNKNOWN ||
-           (image_type != IH_TYPE_SCRIPT && image_loadaddr == 0) ||
+           (image_type != IH_TYPE_SCRIPT && image_type != IH_TYPE_RAMDISK &&
+            image_loadaddr == 0) ||
            image_name == NULL)
                usage();