Module Name: src
Committed By: jmcneill
Date: Thu Sep 30 20:02:55 UTC 2021
Modified Files:
src/distrib/sets/lists/base: ad.riscv
src/share/mk: bsd.own.mk
src/sys/arch/riscv: Makefile
Added Files:
src/sys/arch/riscv/stand: Makefile Makefile.inc
Log Message:
efiboot: Build and install bootriscv64.efi for riscv64 builds.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.1262 -r1.1263 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/stand/Makefile \
src/sys/arch/riscv/stand/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/ad.riscv
diff -u src/distrib/sets/lists/base/ad.riscv:1.21 src/distrib/sets/lists/base/ad.riscv:1.22
--- src/distrib/sets/lists/base/ad.riscv:1.21 Fri Jul 3 16:43:50 2015
+++ src/distrib/sets/lists/base/ad.riscv Thu Sep 30 20:02:54 2021
@@ -1,3 +1,4 @@
-# $NetBSD: ad.riscv,v 1.21 2015/07/03 16:43:50 matt Exp $
+# $NetBSD: ad.riscv,v 1.22 2021/09/30 20:02:54 jmcneill Exp $
./libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
./usr/libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
+./usr/mdec/bootriscv64.efi base-sysutil-bin uefi,arch64
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1262 src/share/mk/bsd.own.mk:1.1263
--- src/share/mk/bsd.own.mk:1.1262 Sun Sep 26 15:52:40 2021
+++ src/share/mk/bsd.own.mk Thu Sep 30 20:02:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1262 2021/09/26 15:52:40 maya Exp $
+# $NetBSD: bsd.own.mk,v 1.1263 2021/09/30 20:02:54 jmcneill Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -153,7 +153,8 @@ HAVE_ACPI= no
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_ARCH} == "ia64" || \
!empty(MACHINE_ARCH:Mearmv7*) || \
- !empty(MACHINE_ARCH:Maarch64*)
+ !empty(MACHINE_ARCH:Maarch64*) || \
+ ${MACHINE_ARCH} == "riscv64"
HAVE_UEFI= yes
.else
HAVE_UEFI= no
Index: src/sys/arch/riscv/Makefile
diff -u src/sys/arch/riscv/Makefile:1.1 src/sys/arch/riscv/Makefile:1.2
--- src/sys/arch/riscv/Makefile:1.1 Fri Sep 19 17:36:25 2014
+++ src/sys/arch/riscv/Makefile Thu Sep 30 20:02:54 2021
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2014/09/19 17:36:25 matt Exp $
+# $NetBSD: Makefile,v 1.2 2021/09/30 20:02:54 jmcneill Exp $
-SUBDIR= include
+SUBDIR= include stand
-.include <bsd.kinc.mk>
+.include <bsd.subdir.mk>
Added files:
Index: src/sys/arch/riscv/stand/Makefile
diff -u /dev/null src/sys/arch/riscv/stand/Makefile:1.1
--- /dev/null Thu Sep 30 20:02:55 2021
+++ src/sys/arch/riscv/stand/Makefile Thu Sep 30 20:02:55 2021
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2021/09/30 20:02:55 jmcneill Exp $
+
+.include <bsd.own.mk>
+
+.if ${HAVE_UEFI:Uno} == "yes"
+. if ${MACHINE_ARCH} == "riscv64"
+SUBDIR+= ../../../stand/efiboot/bootriscv64
+. endif
+.endif
+
+.include <bsd.subdir.mk>
Index: src/sys/arch/riscv/stand/Makefile.inc
diff -u /dev/null src/sys/arch/riscv/stand/Makefile.inc:1.1
--- /dev/null Thu Sep 30 20:02:55 2021
+++ src/sys/arch/riscv/stand/Makefile.inc Thu Sep 30 20:02:55 2021
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/30 20:02:55 jmcneill Exp $
+
+BINDIR?= /usr/mdec
+FILESDIR?= /usr/mdec
