Support arm64, i386 and or1k.

This commit is contained in:
msaitoh 2014-09-30 10:21:50 +00:00
parent f401fa494c
commit 1d272d4ec2
3 changed files with 15 additions and 8 deletions

View File

@ -1,4 +1,4 @@
.\" $NetBSD: mkubootimage.1,v 1.5 2012/12/29 15:11:56 jmcneill Exp $
.\" $NetBSD: mkubootimage.1,v 1.6 2014/09/30 10:21:50 msaitoh Exp $
.\"
.\" Copyright (c) 2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@ -36,7 +36,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl h
.Fl A No ( arm Ns | Ns mips Ns | Ns mips64 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 )
.Fl a Ar address
.Op Fl C No 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 mips Ns | Ns mips64 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 )
Defines the architecture.
This is required.
.It Fl a Ar address

View File

@ -1,4 +1,4 @@
/* $NetBSD: mkubootimage.c,v 1.17 2012/12/29 15:11:56 jmcneill Exp $ */
/* $NetBSD: mkubootimage.c,v 1.18 2014/09/30 10:21:50 msaitoh Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcneill@invisible.ca>
@ -30,7 +30,7 @@
#endif
#include <sys/cdefs.h>
__RCSID("$NetBSD: mkubootimage.c,v 1.17 2012/12/29 15:11:56 jmcneill Exp $");
__RCSID("$NetBSD: mkubootimage.c,v 1.18 2014/09/30 10:21:50 msaitoh Exp $");
#include <sys/mman.h>
#include <sys/stat.h>
@ -106,9 +106,12 @@ static const struct uboot_arch {
const char *name;
} uboot_arch[] = {
{ IH_ARCH_ARM, "arm" },
{ IH_ARCH_I386, "i386" },
{ IH_ARCH_MIPS, "mips" },
{ IH_ARCH_MIPS64, "mips64" },
{ IH_ARCH_PPC, "powerpc" },
{ IH_ARCH_OPENRISC, "or1k" },
{ IH_ARCH_ARM64, "arm64" },
};
static enum uboot_image_arch
@ -214,7 +217,8 @@ get_comp_name(enum uboot_image_comp comp)
__dead static void
usage(void)
{
fprintf(stderr, "usage: mkubootimage -A <arm|mips|mips64|powerpc>");
fprintf(stderr, "usage: mkubootimage -A "
"<arm|arm64|i386|mips|mips64|or1k|powerpc>");
fprintf(stderr, " -C <none|bz2|gz|lzma|lzo>");
fprintf(stderr, " -O <openbsd|netbsd|freebsd|linux>");
fprintf(stderr, " -T <standalone|kernel|ramdisk|fs|script>");

View File

@ -1,4 +1,4 @@
/* $NetBSD: uboot.h,v 1.5 2012/12/29 15:11:56 jmcneill Exp $ */
/* $NetBSD: uboot.h,v 1.6 2014/09/30 10:21:50 msaitoh Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill <jmcneill@invisible.ca>
@ -39,9 +39,12 @@ enum uboot_image_os {
enum uboot_image_arch {
IH_ARCH_UNKNOWN = 0,
IH_ARCH_ARM = 2,
IH_ARCH_I386 = 3,
IH_ARCH_MIPS = 5,
IH_ARCH_MIPS64 = 6,
IH_ARCH_PPC = 7
IH_ARCH_PPC = 7,
IH_ARCH_OPENRISC = 21,
IH_ARCH_ARM64 = 22
};
enum uboot_image_type {