Module Name: src
Committed By: martin
Date: Wed Sep 13 09:42:51 UTC 2023
Modified Files:
src/sys/arch/arm/dts [netbsd-10]: sun8i-h3-orangepi-plus2e.dts
Removed Files:
src/sys/arch/arm/dts [netbsd-10]: sun8i-h3-orangepi-one.dts
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #371):
sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts: revision 1.5
sys/arch/arm/dts/sun8i-h3-orangepi-one.dts: file removal
Remove now-unneeded and brocken (probably since dts-5.15 import)
sun8i-h3-orangepi-one.dts, and let the build use the one from sys/external.
Problem reported and fix tested by Dave Tyson as reported on port-arm@
While there remove #include "sun8i-h3.dtsi" from sun8i-h3-orangepi-plus2e.dts,
this file has been removed with the dts-5.15 import.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r0 src/sys/arch/arm/dts/sun8i-h3-orangepi-one.dts
cvs rdiff -u -r1.4 -r1.4.28.1 \
src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts
diff -u src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4.28.1
--- src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts:1.4 Tue May 21 22:31:39 2019
+++ src/sys/arch/arm/dts/sun8i-h3-orangepi-plus2e.dts Wed Sep 13 09:42:50 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.4 2019/05/21 22:31:39 jmcneill Exp $ */
+/* $NetBSD: sun8i-h3-orangepi-plus2e.dts,v 1.4.28.1 2023/09/13 09:42:50 martin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,6 @@
*/
#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts"
-#include "sun8i-h3.dtsi"
/ {
cpus {
