Module Name: src
Committed By: skrll
Date: Sat Nov 13 10:13:43 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk
src/sys/dtb: Makefile
Added Files:
src/distrib/sets/lists/dtb: ad.riscv32 ad.riscv64
src/sys/dtb/riscv: Makefile Makefile.inc
src/sys/dtb/riscv/sifive: Makefile
Log Message:
Hook in riscv dtb build
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/dtb/ad.riscv32 \
src/distrib/sets/lists/dtb/ad.riscv64
cvs rdiff -u -r1.1267 -r1.1268 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.4 -r1.5 src/sys/dtb/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/dtb/riscv/Makefile \
src/sys/dtb/riscv/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/dtb/riscv/sifive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1267 src/share/mk/bsd.own.mk:1.1268
--- src/share/mk/bsd.own.mk:1.1267 Sat Nov 13 09:41:15 2021
+++ src/share/mk/bsd.own.mk Sat Nov 13 10:13:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1267 2021/11/13 09:41:15 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1268 2021/11/13 10:13:42 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1263,6 +1263,8 @@ MKDTB.earmv7= yes
MKDTB.earmv7hf= yes
MKDTB.earmv7eb= yes
MKDTB.earmv7hfeb= yes
+MKDTB.riscv32= yes
+MKDTB.riscv64= yes
HAVE_MESA_VER?= 19
.if ${HAVE_MESA_VER} == 19
Index: src/sys/dtb/Makefile
diff -u src/sys/dtb/Makefile:1.4 src/sys/dtb/Makefile:1.5
--- src/sys/dtb/Makefile:1.4 Sat May 23 02:11:24 2020
+++ src/sys/dtb/Makefile Sat Nov 13 10:13:42 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/05/23 02:11:24 rin Exp $
+# $NetBSD: Makefile,v 1.5 2021/11/13 10:13:42 skrll Exp $
TARGETS+= dtblist
@@ -12,6 +12,10 @@ SUBDIR+= arm
SUBDIR+= arm64
.endif
+.if !empty(MACHINE_ARCH:Mriscv*)
+SUBDIR+= riscv
+.endif
+
.include <bsd.subdir.mk>
# Regenerate MD set lists in distrib/sets/lists/dtb. Run this whenever
@@ -20,6 +24,7 @@ SUBDIR+= arm64
TARGET_ARCH_LIST= earmv6 earmv6hf earmv6eb earmv6hfeb
TARGET_ARCH_LIST+= earmv7 earmv7hf earmv7hf earmv7hfeb
TARGET_ARCH_LIST+= aarch64 aarch64eb
+TARGET_ARCH_LIST+= riscv32 riscv64
update-sets:
.for _arch in ${TARGET_ARCH_LIST}
Added files:
Index: src/distrib/sets/lists/dtb/ad.riscv32
diff -u /dev/null src/distrib/sets/lists/dtb/ad.riscv32:1.1
--- /dev/null Sat Nov 13 10:13:43 2021
+++ src/distrib/sets/lists/dtb/ad.riscv32 Sat Nov 13 10:13:42 2021
@@ -0,0 +1,8 @@
+# $NetBSD: ad.riscv32,v 1.1 2021/11/13 10:13:42 skrll Exp $
+#
+# DO NOT EDIT THIS FILE MANUALLY
+# Generated by "make update-sets" in sys/dtb
+#
+./boot/dtb/sifive dtb-base-boot dtb
+./boot/dtb/sifive/hifive-unleashed-a00.dtb dtb-base-boot dtb
+./boot/dtb/sifive/hifive-unmatched-a00.dtb dtb-base-boot dtb
Index: src/distrib/sets/lists/dtb/ad.riscv64
diff -u /dev/null src/distrib/sets/lists/dtb/ad.riscv64:1.1
--- /dev/null Sat Nov 13 10:13:43 2021
+++ src/distrib/sets/lists/dtb/ad.riscv64 Sat Nov 13 10:13:42 2021
@@ -0,0 +1,8 @@
+# $NetBSD: ad.riscv64,v 1.1 2021/11/13 10:13:42 skrll Exp $
+#
+# DO NOT EDIT THIS FILE MANUALLY
+# Generated by "make update-sets" in sys/dtb
+#
+./boot/dtb/sifive dtb-base-boot dtb
+./boot/dtb/sifive/hifive-unleashed-a00.dtb dtb-base-boot dtb
+./boot/dtb/sifive/hifive-unmatched-a00.dtb dtb-base-boot dtb
Index: src/sys/dtb/riscv/Makefile
diff -u /dev/null src/sys/dtb/riscv/Makefile:1.1
--- /dev/null Sat Nov 13 10:13:43 2021
+++ src/sys/dtb/riscv/Makefile Sat Nov 13 10:13:42 2021
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2021/11/13 10:13:42 skrll Exp $
+
+TARGETS+= dtblist
+
+SUBDIR+= sifive
+
+.include <bsd.subdir.mk>
Index: src/sys/dtb/riscv/Makefile.inc
diff -u /dev/null src/sys/dtb/riscv/Makefile.inc:1.1
--- /dev/null Sat Nov 13 10:13:43 2021
+++ src/sys/dtb/riscv/Makefile.inc Sat Nov 13 10:13:42 2021
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.inc,v 1.1 2021/11/13 10:13:42 skrll Exp $
+
+DTSARCH= riscv
+DTSGNUARCH= riscv
+
+ARCHDTSDIR= $S/external/gpl2/dts/dist/arch/riscv/boot/dts
Index: src/sys/dtb/riscv/sifive/Makefile
diff -u /dev/null src/sys/dtb/riscv/sifive/Makefile:1.1
--- /dev/null Sat Nov 13 10:13:43 2021
+++ src/sys/dtb/riscv/sifive/Makefile Sat Nov 13 10:13:42 2021
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2021/11/13 10:13:42 skrll Exp $
+
+DTSSUBDIR= sifive
+DTSMAKEVARS= CONFIG_SOC_SIFIVE=y
+DTSFILESCMD= ${MAKE} -C ${ARCHDTSDIR}/${DTSSUBDIR} ${DTSMAKEVARS} -v dtb-y
+DTS= ${DTSFILESCMD:sh}
+
+.include <bsd.dtb.mk>
