Module Name: src
Committed By: tnn
Date: Thu Mar 5 14:24:46 UTC 2020
Modified Files:
src/sys/arch/arm/dts: meson8b-odroidc1.dts omap3-beagle-xm.dts
omap3-beagle.dts omap3-n900.dts
Log Message:
#include_next confuses clang-cpp; use relative pathname to upstream dts
warning: #include_next in file found relative to primary source file or
found by absolute path; will search from start of include path
[-Winclude-next-absolute-path]
error: #include nested too deeply
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/meson8b-odroidc1.dts
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/omap3-beagle-xm.dts \
src/sys/arch/arm/dts/omap3-beagle.dts src/sys/arch/arm/dts/omap3-n900.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/meson8b-odroidc1.dts
diff -u src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.4 src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.5
--- src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.4 Wed Aug 14 09:54:34 2019
+++ src/sys/arch/arm/dts/meson8b-odroidc1.dts Thu Mar 5 14:24:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b-odroidc1.dts,v 1.4 2019/08/14 09:54:34 jmcneill Exp $ */
+/* $NetBSD: meson8b-odroidc1.dts,v 1.5 2020/03/05 14:24:46 tnn Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
-#include_next "meson8b-odroidc1.dts"
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/meson8b-odroidc1.dts"
#include "meson8b.dtsi"
&genfb {
Index: src/sys/arch/arm/dts/omap3-beagle-xm.dts
diff -u src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.1 src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.2
--- src/sys/arch/arm/dts/omap3-beagle-xm.dts:1.1 Thu Oct 31 01:25:56 2019
+++ src/sys/arch/arm/dts/omap3-beagle-xm.dts Thu Mar 5 14:24:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3-beagle-xm.dts,v 1.1 2019/10/31 01:25:56 sevan Exp $ */
+/* $NetBSD: omap3-beagle-xm.dts,v 1.2 2020/03/05 14:24:46 tnn Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include_next "omap3-beagle-xm.dts"
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/omap3-beagle-xm.dts"
/ {
chosen {
Index: src/sys/arch/arm/dts/omap3-beagle.dts
diff -u src/sys/arch/arm/dts/omap3-beagle.dts:1.1 src/sys/arch/arm/dts/omap3-beagle.dts:1.2
--- src/sys/arch/arm/dts/omap3-beagle.dts:1.1 Tue Oct 29 22:18:28 2019
+++ src/sys/arch/arm/dts/omap3-beagle.dts Thu Mar 5 14:24:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3-beagle.dts,v 1.1 2019/10/29 22:18:28 jmcneill Exp $ */
+/* $NetBSD: omap3-beagle.dts,v 1.2 2020/03/05 14:24:46 tnn Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
-#include_next "omap3-beagle.dts"
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/omap3-beagle.dts"
/ {
chosen {
Index: src/sys/arch/arm/dts/omap3-n900.dts
diff -u src/sys/arch/arm/dts/omap3-n900.dts:1.1 src/sys/arch/arm/dts/omap3-n900.dts:1.2
--- src/sys/arch/arm/dts/omap3-n900.dts:1.1 Thu Oct 31 17:09:13 2019
+++ src/sys/arch/arm/dts/omap3-n900.dts Thu Mar 5 14:24:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3-n900.dts,v 1.1 2019/10/31 17:09:13 jmcneill Exp $ */
+/* $NetBSD: omap3-n900.dts,v 1.2 2020/03/05 14:24:46 tnn Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
-#include_next "omap3-n900.dts"
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/omap3-n900.dts"
/ {
chosen {
