Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/dts #include_next confuses clang-cpp; use relat...



details:   https://anonhg.NetBSD.org/src/rev/010d89b75a19
branches:  trunk
changeset: 969915:010d89b75a19
user:      tnn <tnn%NetBSD.org@localhost>
date:      Thu Mar 05 14:24:46 2020 +0000

description:
#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

diffstat:

 sys/arch/arm/dts/meson8b-odroidc1.dts |  4 ++--
 sys/arch/arm/dts/omap3-beagle-xm.dts  |  4 ++--
 sys/arch/arm/dts/omap3-beagle.dts     |  4 ++--
 sys/arch/arm/dts/omap3-n900.dts       |  4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r a4e405fc6d6a -r 010d89b75a19 sys/arch/arm/dts/meson8b-odroidc1.dts
--- a/sys/arch/arm/dts/meson8b-odroidc1.dts     Thu Mar 05 13:11:30 2020 +0000
+++ b/sys/arch/arm/dts/meson8b-odroidc1.dts     Thu Mar 05 14:24:46 2020 +0000
@@ -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@localhost>
@@ -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 -r a4e405fc6d6a -r 010d89b75a19 sys/arch/arm/dts/omap3-beagle-xm.dts
--- a/sys/arch/arm/dts/omap3-beagle-xm.dts      Thu Mar 05 13:11:30 2020 +0000
+++ b/sys/arch/arm/dts/omap3-beagle-xm.dts      Thu Mar 05 14:24:46 2020 +0000
@@ -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 -r a4e405fc6d6a -r 010d89b75a19 sys/arch/arm/dts/omap3-beagle.dts
--- a/sys/arch/arm/dts/omap3-beagle.dts Thu Mar 05 13:11:30 2020 +0000
+++ b/sys/arch/arm/dts/omap3-beagle.dts Thu Mar 05 14:24:46 2020 +0000
@@ -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@localhost>
@@ -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 -r a4e405fc6d6a -r 010d89b75a19 sys/arch/arm/dts/omap3-n900.dts
--- a/sys/arch/arm/dts/omap3-n900.dts   Thu Mar 05 13:11:30 2020 +0000
+++ b/sys/arch/arm/dts/omap3-n900.dts   Thu Mar 05 14:24:46 2020 +0000
@@ -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@localhost>
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include_next "omap3-n900.dts"
+#include "../../../external/gpl2/dts/dist/arch/arm/boot/dts/omap3-n900.dts"
 
 / {
        chosen {



Home | Main Index | Thread Index | Old Index