aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bsdinstall/partedit
diff options
context:
space:
mode:
authorMitchell Horne <mhorne@FreeBSD.org>2021-01-15 16:34:54 +0000
committerMitchell Horne <mhorne@FreeBSD.org>2021-01-27 23:29:42 +0000
commit7b08a307e88bb1abe17d13d11288392a8e4739ce (patch)
treef69a8bc45f35b3e7cd7c9ccfe7c44c338ec85965 /usr.sbin/bsdinstall/partedit
parent676b7d077c2c5f548334cea7fccfbfb5d097c9df (diff)
bsdinstall: riscv-specific tweaks
Make the installer more useful, by allowing it to create a bootable installation. Also, enable the menu option for ZFS-on-root. Like arm64, RISC-V boots by UEFI only, so arm64's partedit implementation is renamed and shared among the two platforms. Reviewed by: gjb MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D28180
Diffstat (limited to 'usr.sbin/bsdinstall/partedit')
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile2
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit_efi.c (renamed from usr.sbin/bsdinstall/partedit/partedit_arm64.c)7
2 files changed, 8 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 7d8f0659da25..a250302a1962 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -10,6 +10,8 @@ LIBADD+= geom ncursesw util dialog m
PARTEDIT_ARCH= ${MACHINE}
.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
PARTEDIT_ARCH= x86
+.elif ${MACHINE} == "arm64" || ${MACHINE} == "riscv"
+PARTEDIT_ARCH= efi
.endif
.if !exists(partedit_${PARTEDIT_ARCH}.c)
PARTEDIT_ARCH= generic
diff --git a/usr.sbin/bsdinstall/partedit/partedit_arm64.c b/usr.sbin/bsdinstall/partedit/partedit_efi.c
index 934cd30c72f9..85b3b15d1853 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_arm64.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_efi.c
@@ -34,6 +34,11 @@
#include "partedit.h"
+/*
+ * partedit implementation for platforms on which the installer only offers
+ * UEFI-based boot. Currently, this includes arm64 and RISC-V.
+ */
+
/* EFI partition size in bytes */
#define EFI_BOOTPART_SIZE (260 * 1024 * 1024)
@@ -94,7 +99,7 @@ const char *
partcode_path(const char *part_type, const char *fs_type)
{
- /* No boot partition data for ARM64 */
+ /* No boot partition data. */
return (NULL);
}