Module Name: src
Committed By: jmcneill
Date: Wed Jun 2 10:31:18 UTC 2021
Modified Files:
src/distrib/sets/lists/dtb: ad.aarch64 ad.aarch64eb ad.earmv6
ad.earmv6eb ad.earmv6hf ad.earmv6hfeb ad.earmv7 ad.earmv7hf
ad.earmv7hfeb
src/sys/dtb/arm64/rockchip: Makefile
Log Message:
Install a copy of rk3399-pinebook-pro.dtb to the base dtb directory for
compatibility with the factory firmware. Normally this is frowned upon,
but this is the only easy way to boot NetBSD on this board without
having to crack open the case and/or hook up a serial console.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/dtb/ad.aarch64
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/dtb/ad.aarch64eb \
src/distrib/sets/lists/dtb/ad.earmv7 \
src/distrib/sets/lists/dtb/ad.earmv7hf \
src/distrib/sets/lists/dtb/ad.earmv7hfeb
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/dtb/ad.earmv6 \
src/distrib/sets/lists/dtb/ad.earmv6eb \
src/distrib/sets/lists/dtb/ad.earmv6hf \
src/distrib/sets/lists/dtb/ad.earmv6hfeb
cvs rdiff -u -r1.1 -r1.2 src/sys/dtb/arm64/rockchip/Makefile
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/dtb/ad.aarch64
diff -u src/distrib/sets/lists/dtb/ad.aarch64:1.6 src/distrib/sets/lists/dtb/ad.aarch64:1.7
--- src/distrib/sets/lists/dtb/ad.aarch64:1.6 Sat Jan 2 11:36:36 2021
+++ src/distrib/sets/lists/dtb/ad.aarch64 Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.6 2021/01/02 11:36:36 ryo Exp $
+# $NetBSD: ad.aarch64,v 1.7 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
@@ -101,6 +101,7 @@
./boot/dtb/nvidia/tegra210-p2894-0050-a08.dtb dtb-base-boot dtb
./boot/dtb/nvidia/tegra210-p3450-0000.dtb dtb-base-boot dtb
./boot/dtb/nvidia/tegra210-smaug.dtb dtb-base-boot dtb
+./boot/dtb/rk3399-pinebook-pro.dtb dtb-base-boot dtb
./boot/dtb/rockchip dtb-base-boot dtb
./boot/dtb/rockchip/px30-evb.dtb dtb-base-boot dtb
./boot/dtb/rockchip/rk3308-evb.dtb dtb-base-boot dtb
Index: src/distrib/sets/lists/dtb/ad.aarch64eb
diff -u src/distrib/sets/lists/dtb/ad.aarch64eb:1.5 src/distrib/sets/lists/dtb/ad.aarch64eb:1.6
--- src/distrib/sets/lists/dtb/ad.aarch64eb:1.5 Sat Jan 2 11:36:36 2021
+++ src/distrib/sets/lists/dtb/ad.aarch64eb Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64eb,v 1.5 2021/01/02 11:36:36 ryo Exp $
+# $NetBSD: ad.aarch64eb,v 1.6 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
@@ -101,6 +101,7 @@
./boot/dtb/nvidia/tegra210-p2894-0050-a08.dtb dtb-base-boot dtb
./boot/dtb/nvidia/tegra210-p3450-0000.dtb dtb-base-boot dtb
./boot/dtb/nvidia/tegra210-smaug.dtb dtb-base-boot dtb
+./boot/dtb/rk3399-pinebook-pro.dtb dtb-base-boot dtb
./boot/dtb/rockchip dtb-base-boot dtb
./boot/dtb/rockchip/px30-evb.dtb dtb-base-boot dtb
./boot/dtb/rockchip/rk3308-evb.dtb dtb-base-boot dtb
Index: src/distrib/sets/lists/dtb/ad.earmv7
diff -u src/distrib/sets/lists/dtb/ad.earmv7:1.5 src/distrib/sets/lists/dtb/ad.earmv7:1.6
--- src/distrib/sets/lists/dtb/ad.earmv7:1.5 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv7 Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv7,v 1.5 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv7,v 1.6 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/distrib/sets/lists/dtb/ad.earmv7hf
diff -u src/distrib/sets/lists/dtb/ad.earmv7hf:1.5 src/distrib/sets/lists/dtb/ad.earmv7hf:1.6
--- src/distrib/sets/lists/dtb/ad.earmv7hf:1.5 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv7hf Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv7hf,v 1.5 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv7hf,v 1.6 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/distrib/sets/lists/dtb/ad.earmv7hfeb
diff -u src/distrib/sets/lists/dtb/ad.earmv7hfeb:1.5 src/distrib/sets/lists/dtb/ad.earmv7hfeb:1.6
--- src/distrib/sets/lists/dtb/ad.earmv7hfeb:1.5 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv7hfeb Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv7hfeb,v 1.5 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv7hfeb,v 1.6 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/distrib/sets/lists/dtb/ad.earmv6
diff -u src/distrib/sets/lists/dtb/ad.earmv6:1.4 src/distrib/sets/lists/dtb/ad.earmv6:1.5
--- src/distrib/sets/lists/dtb/ad.earmv6:1.4 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv6 Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv6,v 1.4 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv6,v 1.5 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/distrib/sets/lists/dtb/ad.earmv6eb
diff -u src/distrib/sets/lists/dtb/ad.earmv6eb:1.4 src/distrib/sets/lists/dtb/ad.earmv6eb:1.5
--- src/distrib/sets/lists/dtb/ad.earmv6eb:1.4 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv6eb Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv6eb,v 1.4 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv6eb,v 1.5 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/distrib/sets/lists/dtb/ad.earmv6hf
diff -u src/distrib/sets/lists/dtb/ad.earmv6hf:1.4 src/distrib/sets/lists/dtb/ad.earmv6hf:1.5
--- src/distrib/sets/lists/dtb/ad.earmv6hf:1.4 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv6hf Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv6hf,v 1.4 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv6hf,v 1.5 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/distrib/sets/lists/dtb/ad.earmv6hfeb
diff -u src/distrib/sets/lists/dtb/ad.earmv6hfeb:1.4 src/distrib/sets/lists/dtb/ad.earmv6hfeb:1.5
--- src/distrib/sets/lists/dtb/ad.earmv6hfeb:1.4 Wed Jun 10 18:53:31 2020
+++ src/distrib/sets/lists/dtb/ad.earmv6hfeb Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv6hfeb,v 1.4 2020/06/10 18:53:31 jmcneill Exp $
+# $NetBSD: ad.earmv6hfeb,v 1.5 2021/06/02 10:31:18 jmcneill Exp $
#
# DO NOT EDIT THIS FILE MANUALLY
# Generated by "make update-sets" in sys/dtb
Index: src/sys/dtb/arm64/rockchip/Makefile
diff -u src/sys/dtb/arm64/rockchip/Makefile:1.1 src/sys/dtb/arm64/rockchip/Makefile:1.2
--- src/sys/dtb/arm64/rockchip/Makefile:1.1 Mon May 18 21:19:36 2020
+++ src/sys/dtb/arm64/rockchip/Makefile Wed Jun 2 10:31:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/05/18 21:19:36 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2021/06/02 10:31:18 jmcneill Exp $
DTSSUBDIR= rockchip
DTSMAKEVARS= CONFIG_ARCH_ROCKCHIP=y
@@ -8,4 +8,8 @@ DTS= ${DTSFILESCMD:sh}
# Extra .dts files from sys/arch/arm/dts
DTS+= rk3399-pinebook-pro.dts
+# For compatibility with factory firmware, copy rk3399-pinebook-pro.dtb to
+# the base directory.
+DTB_NOSUBDIR+= rk3399-pinebook-pro.dtb
+
.include <bsd.dtb.mk>
