Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Hook in riscv dtb build



details:   https://anonhg.NetBSD.org/src/rev/156e6267ba08
branches:  trunk
changeset: 1025577:156e6267ba08
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Nov 13 10:13:42 2021 +0000

description:
Hook in riscv dtb build

diffstat:

 distrib/sets/lists/dtb/ad.riscv32 |  8 ++++++++
 distrib/sets/lists/dtb/ad.riscv64 |  8 ++++++++
 share/mk/bsd.own.mk               |  4 +++-
 sys/dtb/Makefile                  |  7 ++++++-
 sys/dtb/riscv/Makefile            |  7 +++++++
 sys/dtb/riscv/Makefile.inc        |  6 ++++++
 sys/dtb/riscv/sifive/Makefile     |  8 ++++++++
 7 files changed, 46 insertions(+), 2 deletions(-)

diffs (103 lines):

diff -r 23f3ebb86aa2 -r 156e6267ba08 distrib/sets/lists/dtb/ad.riscv32
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/dtb/ad.riscv32 Sat Nov 13 10:13:42 2021 +0000
@@ -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
diff -r 23f3ebb86aa2 -r 156e6267ba08 distrib/sets/lists/dtb/ad.riscv64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sets/lists/dtb/ad.riscv64 Sat Nov 13 10:13:42 2021 +0000
@@ -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
diff -r 23f3ebb86aa2 -r 156e6267ba08 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Nov 13 09:41:15 2021 +0000
+++ b/share/mk/bsd.own.mk       Sat Nov 13 10:13:42 2021 +0000
@@ -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.earmv7hf=                        yes
 MKDTB.earmv7eb=                        yes
 MKDTB.earmv7hfeb=              yes
+MKDTB.riscv32=                 yes
+MKDTB.riscv64=                 yes
 
 HAVE_MESA_VER?=        19
 .if ${HAVE_MESA_VER} == 19
diff -r 23f3ebb86aa2 -r 156e6267ba08 sys/dtb/Makefile
--- a/sys/dtb/Makefile  Sat Nov 13 09:41:15 2021 +0000
+++ b/sys/dtb/Makefile  Sat Nov 13 10:13:42 2021 +0000
@@ -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+=       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 @@
 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}
diff -r 23f3ebb86aa2 -r 156e6267ba08 sys/dtb/riscv/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dtb/riscv/Makefile    Sat Nov 13 10:13:42 2021 +0000
@@ -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>
diff -r 23f3ebb86aa2 -r 156e6267ba08 sys/dtb/riscv/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dtb/riscv/Makefile.inc        Sat Nov 13 10:13:42 2021 +0000
@@ -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
diff -r 23f3ebb86aa2 -r 156e6267ba08 sys/dtb/riscv/sifive/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dtb/riscv/sifive/Makefile     Sat Nov 13 10:13:42 2021 +0000
@@ -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>



Home | Main Index | Thread Index | Old Index