Module Name: src
Committed By: gutteridge
Date: Tue May 21 03:54:32 UTC 2024
Modified Files:
src/usr.bin/mkubootimage: mkubootimage.1 mkubootimage.c uboot.h
Log Message:
mkubootimage(1): add riscv
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/mkubootimage/mkubootimage.1
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/mkubootimage/mkubootimage.c
cvs rdiff -u -r1.8 -r1.9 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.15 src/usr.bin/mkubootimage/mkubootimage.1:1.16
--- src/usr.bin/mkubootimage/mkubootimage.1:1.15 Fri Feb 9 16:10:18 2024
+++ src/usr.bin/mkubootimage/mkubootimage.1 Tue May 21 03:54:31 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkubootimage.1,v 1.15 2024/02/09 16:10:18 christos Exp $
+.\" $NetBSD: mkubootimage.1,v 1.16 2024/05/21 03:54:31 gutteridge 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 February 7, 2024
+.Dd May 21, 2024
.Dt MKUBOOTIMAGE 1
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Sh SYNOPSIS
.Nm
.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 No ( arm Ns | Ns arm64 Ns | Ns i386 Ns | Ns mips Ns | Ns mips64 Ns | Ns or1k Ns | Ns powerpc Ns | Ns riscv 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
@@ -56,7 +56,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 Ns | Ns sh )
+.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 riscv Ns | Ns sh )
Defines the architecture.
This is required for
.Qq uimg
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.31 src/usr.bin/mkubootimage/mkubootimage.c:1.32
--- src/usr.bin/mkubootimage/mkubootimage.c:1.31 Fri Feb 9 16:10:18 2024
+++ src/usr.bin/mkubootimage/mkubootimage.c Tue May 21 03:54:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.31 2024/02/09 16:10:18 christos Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.32 2024/05/21 03:54:31 gutteridge Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkubootimage.c,v 1.31 2024/02/09 16:10:18 christos Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.32 2024/05/21 03:54:31 gutteridge Exp $");
#include <sys/mman.h>
#include <sys/stat.h>
@@ -155,6 +155,7 @@ static const struct uboot_arch {
{ IH_ARCH_MIPS64, "mips64" },
{ IH_ARCH_PPC, "powerpc" },
{ IH_ARCH_OPENRISC, "or1k" },
+ { IH_ARCH_RISCV, "riscv" },
{ IH_ARCH_SH, "sh" },
};
@@ -263,7 +264,7 @@ __dead static void
usage(void)
{
fprintf(stderr,
-"Usage: %s [-hu] -A <arm|arm64|i386|mips|mips64|or1k|powerpc|sh> -a address\n"
+"Usage: %s [-hu] -A <arm|arm64|i386|mips|mips64|or1k|powerpc|riscv|sh> -a address\n"
"\t-C <bz2|gz|lzma|lzo|none> [-E address] [-e address] [-t timestamp]\n"
"\t[-f <arm64|uimg>] [-m magic] -n image -O <freebsd|linux|netbsd|openbsd>\n"
"\t-T <fs|kernel|kernel_noload|ramdisk|script|standalone>\n"
Index: src/usr.bin/mkubootimage/uboot.h
diff -u src/usr.bin/mkubootimage/uboot.h:1.8 src/usr.bin/mkubootimage/uboot.h:1.9
--- src/usr.bin/mkubootimage/uboot.h:1.8 Fri Sep 29 21:18:28 2017
+++ src/usr.bin/mkubootimage/uboot.h Tue May 21 03:54:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uboot.h,v 1.8 2017/09/29 21:18:28 jmcneill Exp $ */
+/* $NetBSD: uboot.h,v 1.9 2024/05/21 03:54:31 gutteridge Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcne...@invisible.ca>
@@ -45,7 +45,8 @@ enum uboot_image_arch {
IH_ARCH_PPC = 7,
IH_ARCH_SH = 9,
IH_ARCH_OPENRISC = 21,
- IH_ARCH_ARM64 = 22
+ IH_ARCH_ARM64 = 22,
+ IH_ARCH_RISCV = 26
};
enum uboot_image_type {
