summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@NetBSD.org>2020-03-05 14:24:46 +0000
committertnn <tnn@NetBSD.org>2020-03-05 14:24:46 +0000
commitc25d10cb9f7de5c72cc0ab4207c19cb612bc3587 (patch)
tree6ac9046df471c0b3b2953bc1cfd955dc0768c407
parent2472a69e22ef04c88f51e28c1c822a98af2c2a6e (diff)
#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
-rw-r--r--sys/arch/arm/dts/meson8b-odroidc1.dts4
-rw-r--r--sys/arch/arm/dts/omap3-beagle-xm.dts4
-rw-r--r--sys/arch/arm/dts/omap3-beagle.dts4
-rw-r--r--sys/arch/arm/dts/omap3-n900.dts4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/arm/dts/meson8b-odroidc1.dts b/sys/arch/arm/dts/meson8b-odroidc1.dts
index 040212926c3..42a87205607 100644
--- a/sys/arch/arm/dts/meson8b-odroidc1.dts
+++ b/sys/arch/arm/dts/meson8b-odroidc1.dts
@@ -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 <jmcneill@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 {
diff --git a/sys/arch/arm/dts/omap3-beagle-xm.dts b/sys/arch/arm/dts/omap3-beagle-xm.dts
index db651bd7c5e..345512ff8e5 100644
--- a/sys/arch/arm/dts/omap3-beagle-xm.dts
+++ b/sys/arch/arm/dts/omap3-beagle-xm.dts
@@ -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 {
diff --git a/sys/arch/arm/dts/omap3-beagle.dts b/sys/arch/arm/dts/omap3-beagle.dts
index 828ef77578e..68025205ea5 100644
--- a/sys/arch/arm/dts/omap3-beagle.dts
+++ b/sys/arch/arm/dts/omap3-beagle.dts
@@ -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 <jmcneill@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 {
diff --git a/sys/arch/arm/dts/omap3-n900.dts b/sys/arch/arm/dts/omap3-n900.dts
index 28e651081f8..20dafae9024 100644
--- a/sys/arch/arm/dts/omap3-n900.dts
+++ b/sys/arch/arm/dts/omap3-n900.dts
@@ -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 <jmcneill@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 {