Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src efiboot: Build and install bootriscv64.efi for riscv64 builds.
details: https://anonhg.NetBSD.org/src/rev/b75d54413e2e
branches: trunk
changeset: 987531:b75d54413e2e
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Thu Sep 30 20:02:54 2021 +0000
description:
efiboot: Build and install bootriscv64.efi for riscv64 builds.
diffstat:
distrib/sets/lists/base/ad.riscv | 3 ++-
share/mk/bsd.own.mk | 5 +++--
sys/arch/riscv/Makefile | 6 +++---
sys/arch/riscv/stand/Makefile | 11 +++++++++++
sys/arch/riscv/stand/Makefile.inc | 4 ++++
5 files changed, 23 insertions(+), 6 deletions(-)
diffs (63 lines):
diff -r 4772dbeb2cb2 -r b75d54413e2e distrib/sets/lists/base/ad.riscv
--- a/distrib/sets/lists/base/ad.riscv Thu Sep 30 19:12:04 2021 +0000
+++ b/distrib/sets/lists/base/ad.riscv Thu Sep 30 20:02:54 2021 +0000
@@ -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
diff -r 4772dbeb2cb2 -r b75d54413e2e share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Thu Sep 30 19:12:04 2021 +0000
+++ b/share/mk/bsd.own.mk Thu Sep 30 20:02:54 2021 +0000
@@ -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 @@
${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
diff -r 4772dbeb2cb2 -r b75d54413e2e sys/arch/riscv/Makefile
--- a/sys/arch/riscv/Makefile Thu Sep 30 19:12:04 2021 +0000
+++ b/sys/arch/riscv/Makefile Thu Sep 30 20:02:54 2021 +0000
@@ -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>
diff -r 4772dbeb2cb2 -r b75d54413e2e sys/arch/riscv/stand/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/riscv/stand/Makefile Thu Sep 30 20:02:54 2021 +0000
@@ -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>
diff -r 4772dbeb2cb2 -r b75d54413e2e sys/arch/riscv/stand/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/riscv/stand/Makefile.inc Thu Sep 30 20:02:54 2021 +0000
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/09/30 20:02:55 jmcneill Exp $
+
+BINDIR?= /usr/mdec
+FILESDIR?= /usr/mdec
Home |
Main Index |
Thread Index |
Old Index