Merge branch 'for-next/dts-warnings'

66 files changed, 86 insertions, 87 deletions

diff --git a/Documentation/devicetree/bindings/barebox/barebox,environment.rst b/Documentation/devicetree/bindings/barebox/barebox,environment.rst
index 029e7f04a4..918efd15f5 100644
--- a/Documentation/devicetree/bindings/barebox/barebox,environment.rst
+++ b/Documentation/devicetree/bindings/barebox/barebox,environment.rst
@@ -30,7 +30,7 @@ Example:
 
 .. code-block:: none
 
-  environment@0 {
+  environment {
   	compatible = "barebox,environment";
   	device-path = &flash, "partname:barebox-environment";
   };
diff --git a/arch/arm/dts/am335x-afi-gf.dts b/arch/arm/dts/am335x-afi-gf.dts
index 479c6cf170..d0860b8905 100644
--- a/arch/arm/dts/am335x-afi-gf.dts
+++ b/arch/arm/dts/am335x-afi-gf.dts
@@ -17,7 +17,7 @@
 	chosen {
 		stdout-path = &uart2;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_spi;
 		};
diff --git a/arch/arm/dts/am335x-baltos-minimal.dts b/arch/arm/dts/am335x-baltos-minimal.dts
index 13eb91c83e..f939cf6406 100644
--- a/arch/arm/dts/am335x-baltos-minimal.dts
+++ b/arch/arm/dts/am335x-baltos-minimal.dts
@@ -21,7 +21,7 @@
 	compatible = "vscom,onrisc", "ti,am33xx";
 
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 	};
 
 	cpus {
diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi
index 0413724e0c..e03ae2a8d3 100644
--- a/arch/arm/dts/am335x-bone-common.dtsi
+++ b/arch/arm/dts/am335x-bone-common.dtsi
@@ -8,7 +8,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 	};
 
 	cpus {
diff --git a/arch/arm/dts/am335x-phytec-phycard-som.dtsi b/arch/arm/dts/am335x-phytec-phycard-som.dtsi
index d608f63e12..6a0442916b 100644
--- a/arch/arm/dts/am335x-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phycard-som.dtsi
@@ -1,6 +1,6 @@
 / {
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 
 		environment-nand {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/am335x-phytec-phycore-som.dtsi b/arch/arm/dts/am335x-phytec-phycore-som.dtsi
index cf2eef3014..cb2d30a15c 100644
--- a/arch/arm/dts/am335x-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phycore-som.dtsi
@@ -1,6 +1,6 @@
 / {
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 
 		environment-spi {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
index 5b8bb5dda9..465d3fa16c 100644
--- a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
@@ -1,6 +1,6 @@
 / {
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 
 		environment-spi {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/at91sam9263ek.dts b/arch/arm/dts/at91sam9263ek.dts
index 3681b845d9..7fe283ced7 100644
--- a/arch/arm/dts/at91sam9263ek.dts
+++ b/arch/arm/dts/at91sam9263ek.dts
@@ -1,7 +1,7 @@
 #include <arm/at91sam9263ek.dts>
 / {
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nand_controller, "partname:bareboxenv";
 		};
diff --git a/arch/arm/dts/dove-cubox-bb.dts b/arch/arm/dts/dove-cubox-bb.dts
index f7ad55c4e7..83e1d5df50 100644
--- a/arch/arm/dts/dove-cubox-bb.dts
+++ b/arch/arm/dts/dove-cubox-bb.dts
@@ -7,7 +7,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 	};
 
 	leds {
diff --git a/arch/arm/dts/imx25-karo-tx25.dts b/arch/arm/dts/imx25-karo-tx25.dts
index 8d79471a30..9296e90b07 100644
--- a/arch/arm/dts/imx25-karo-tx25.dts
+++ b/arch/arm/dts/imx25-karo-tx25.dts
@@ -17,9 +17,9 @@
 	compatible = "karo,imx25-tx25", "fsl,imx25";
 
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nfc, "partname:environment";
 		};
diff --git a/arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts b/arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts
index cb02a1dfce..abfbd5061e 100644
--- a/arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts
+++ b/arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts
@@ -6,9 +6,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nfc, "partname:environment";
 		};
diff --git a/arch/arm/dts/imx51-babbage.dts b/arch/arm/dts/imx51-babbage.dts
index bde3031d1b..5147195617 100644
--- a/arch/arm/dts/imx51-babbage.dts
+++ b/arch/arm/dts/imx51-babbage.dts
@@ -16,7 +16,7 @@
 	chosen {
 		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_esdhc1;
 		};
diff --git a/arch/arm/dts/imx53-ccxmx53.dtsi b/arch/arm/dts/imx53-ccxmx53.dtsi
index 2ed24b65e4..d925ba44d7 100644
--- a/arch/arm/dts/imx53-ccxmx53.dtsi
+++ b/arch/arm/dts/imx53-ccxmx53.dtsi
@@ -16,9 +16,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nfc, "partname:environment";
 		};
diff --git a/arch/arm/dts/imx53-guf-vincell-lt.dts b/arch/arm/dts/imx53-guf-vincell-lt.dts
index 2b1b54acc5..7a133a5010 100644
--- a/arch/arm/dts/imx53-guf-vincell-lt.dts
+++ b/arch/arm/dts/imx53-guf-vincell-lt.dts
@@ -22,7 +22,7 @@
 	compatible = "guf,imx53-vincell-lt", "fsl,imx53";
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx53-guf-vincell.dts b/arch/arm/dts/imx53-guf-vincell.dts
index f743f171d6..d34b59f4d3 100644
--- a/arch/arm/dts/imx53-guf-vincell.dts
+++ b/arch/arm/dts/imx53-guf-vincell.dts
@@ -22,7 +22,7 @@
 	compatible = "guf,imx53-vincell", "fsl,imx53";
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 	};
 
 	clocks {
diff --git a/arch/arm/dts/imx53-mba53.dts b/arch/arm/dts/imx53-mba53.dts
index 6998e4c0cb..53b98e30cf 100644
--- a/arch/arm/dts/imx53-mba53.dts
+++ b/arch/arm/dts/imx53-mba53.dts
@@ -16,7 +16,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment-sd {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx53-qsb-common.dtsi b/arch/arm/dts/imx53-qsb-common.dtsi
index f363af975d..24bbd6741a 100644
--- a/arch/arm/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/dts/imx53-qsb-common.dtsi
@@ -14,7 +14,7 @@
 	chosen {
 		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &bareboxenv;
 		};
diff --git a/arch/arm/dts/imx53-voipac-dmm-668.dtsi b/arch/arm/dts/imx53-voipac-dmm-668.dtsi
index e91c7d02a2..c4c17c2e8e 100644
--- a/arch/arm/dts/imx53-voipac-dmm-668.dtsi
+++ b/arch/arm/dts/imx53-voipac-dmm-668.dtsi
@@ -1,8 +1,8 @@
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nfc, "partname:environment";
 		};
diff --git a/arch/arm/dts/imx6dl-eltec-hipercam.dts b/arch/arm/dts/imx6dl-eltec-hipercam.dts
index 4fe174437e..fe336040c3 100644
--- a/arch/arm/dts/imx6dl-eltec-hipercam.dts
+++ b/arch/arm/dts/imx6dl-eltec-hipercam.dts
@@ -14,7 +14,7 @@
 	chosen {
 		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_nor0;
 		};
diff --git a/arch/arm/dts/imx6dl-hummingboard.dts b/arch/arm/dts/imx6dl-hummingboard.dts
index 7f4d2b42f2..5bfa4704b2 100644
--- a/arch/arm/dts/imx6dl-hummingboard.dts
+++ b/arch/arm/dts/imx6dl-hummingboard.dts
@@ -10,9 +10,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &usdhc2, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6dl-mba6x.dts b/arch/arm/dts/imx6dl-mba6x.dts
index 9520509a1d..cdb0334260 100644
--- a/arch/arm/dts/imx6dl-mba6x.dts
+++ b/arch/arm/dts/imx6dl-mba6x.dts
@@ -18,7 +18,7 @@
 	compatible = "tq,mba6x", "tq,tqma6s", "fsl,imx6dl";
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 	};
 
 	memory {
diff --git a/arch/arm/dts/imx6dl-phytec-pbab01.dts b/arch/arm/dts/imx6dl-phytec-pbab01.dts
index 4b77838926..d10fbf668f 100644
--- a/arch/arm/dts/imx6dl-phytec-pbab01.dts
+++ b/arch/arm/dts/imx6dl-phytec-pbab01.dts
@@ -19,6 +19,6 @@
 	compatible = "phytec,imx6x-pbab01", "phytec,imx6dl-pfla02", "fsl,imx6dl";
 
 	chosen {
-		linux,stdout-path = &uart4;
+		stdout-path = &uart4;
 	};
 };
diff --git a/arch/arm/dts/imx6dl-wandboard.dts b/arch/arm/dts/imx6dl-wandboard.dts
index 873e9d6985..0a7a7182a5 100644
--- a/arch/arm/dts/imx6dl-wandboard.dts
+++ b/arch/arm/dts/imx6dl-wandboard.dts
@@ -4,9 +4,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc3;
 		};
diff --git a/arch/arm/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
index 3576211be4..2b9097c482 100644
--- a/arch/arm/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/dts/imx6q-dmo-edmqmx6.dts
@@ -15,7 +15,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment-sd {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6q-embedsky-e9.dts b/arch/arm/dts/imx6q-embedsky-e9.dts
index 3bbb60bba3..76c940b709 100644
--- a/arch/arm/dts/imx6q-embedsky-e9.dts
+++ b/arch/arm/dts/imx6q-embedsky-e9.dts
@@ -18,7 +18,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
 		environment-mmc1 {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6q-guf-santaro.dts b/arch/arm/dts/imx6q-guf-santaro.dts
index 3217a5bf90..8f886c4e12 100644
--- a/arch/arm/dts/imx6q-guf-santaro.dts
+++ b/arch/arm/dts/imx6q-guf-santaro.dts
@@ -25,7 +25,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment-emmc {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6q-hummingboard.dts b/arch/arm/dts/imx6q-hummingboard.dts
index e707eb91c9..b10acf2cbb 100644
--- a/arch/arm/dts/imx6q-hummingboard.dts
+++ b/arch/arm/dts/imx6q-hummingboard.dts
@@ -10,9 +10,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &usdhc2, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6q-hummingboard2.dts b/arch/arm/dts/imx6q-hummingboard2.dts
index 89065581b8..6c41ab7396 100644
--- a/arch/arm/dts/imx6q-hummingboard2.dts
+++ b/arch/arm/dts/imx6q-hummingboard2.dts
@@ -52,7 +52,7 @@
 	compatible = "solidrun,hummingboard2/q", "fsl,imx6q";
 
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &usdhc3, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6q-mba6x.dts b/arch/arm/dts/imx6q-mba6x.dts
index 69d46b4597..9391c1d6fe 100644
--- a/arch/arm/dts/imx6q-mba6x.dts
+++ b/arch/arm/dts/imx6q-mba6x.dts
@@ -18,7 +18,7 @@
 	compatible = "tq,mba6x", "tq,tqma6q", "fsl,imx6q";
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 	};
 
 	memory {
diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-pbaa03.dts
index bcb3dd7404..4724a02ad7 100644
--- a/arch/arm/dts/imx6q-phytec-pbaa03.dts
+++ b/arch/arm/dts/imx6q-phytec-pbaa03.dts
@@ -17,7 +17,7 @@
 	compatible = "phytec,imx6q-pbaa03", "phytec,imx6q-pcaaxl3", "fsl,imx6q";
 
 	chosen {
-		linux,stdout-path = &uart3;
+		stdout-path = &uart3;
 	};
 };
 
diff --git a/arch/arm/dts/imx6q-sabresd.dts b/arch/arm/dts/imx6q-sabresd.dts
index 1f92c15242..21180df324 100644
--- a/arch/arm/dts/imx6q-sabresd.dts
+++ b/arch/arm/dts/imx6q-sabresd.dts
@@ -21,9 +21,9 @@
 	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
 
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc3;
 		};
diff --git a/arch/arm/dts/imx6q-var-custom.dts b/arch/arm/dts/imx6q-var-custom.dts
index fe03589454..ddb220fb0a 100644
--- a/arch/arm/dts/imx6q-var-custom.dts
+++ b/arch/arm/dts/imx6q-var-custom.dts
@@ -9,13 +9,6 @@
  * http://www.opensource.org/licenses/gpl-license.html
  * http://www.gnu.org/copyleft/gpl.html
  *
- *
- * 		environment@0 {
-			compatible = "barebox,environment";
-			device-path = &usdhc2, "partname:barebox-environment";
-		};
-
- *
  */
 
 /dts-v1/;
@@ -26,9 +19,9 @@
 	compatible = "variscite,imx6q-custom", "variscite,imx6q-som", "fsl,imx6q";
 
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_nand;
 		};
diff --git a/arch/arm/dts/imx6q-wandboard.dts b/arch/arm/dts/imx6q-wandboard.dts
index 0606727a11..d96f057961 100644
--- a/arch/arm/dts/imx6q-wandboard.dts
+++ b/arch/arm/dts/imx6q-wandboard.dts
@@ -4,9 +4,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc3;
 		};
diff --git a/arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi
index 5c7bcd3226..73878cde0d 100644
--- a/arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi
+++ b/arch/arm/dts/imx6qdl-dfi-fs700-m60.dtsi
@@ -2,7 +2,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
 		environment-emmc {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6qdl-gw54xx.dtsi b/arch/arm/dts/imx6qdl-gw54xx.dtsi
index 5f8e489aeb..23e08f7d92 100644
--- a/arch/arm/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/dts/imx6qdl-gw54xx.dtsi
@@ -13,9 +13,9 @@
 
  / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &gpmi, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi
index 26c685c529..19fe7881b3 100644
--- a/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/dts/imx6qdl-nitrogen6_max.dtsi
@@ -42,7 +42,7 @@
  
 / {
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &flash, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
index 76e55e057c..53fdb722d0 100644
--- a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/dts/imx6qdl-nitrogen6x.dtsi
@@ -16,7 +16,7 @@
 
 / {
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &flash, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
index ec14415398..3c197ddf01 100644
--- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi
@@ -13,7 +13,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment-sd1 {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6qdl-sabrelite.dtsi b/arch/arm/dts/imx6qdl-sabrelite.dtsi
index 10b0002ec2..ec3d364bde 100644
--- a/arch/arm/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/dts/imx6qdl-sabrelite.dtsi
@@ -16,9 +16,9 @@
 / {
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &flash, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi b/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi
index 31a12fe268..363da66ec7 100644
--- a/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi
+++ b/arch/arm/dts/imx6qdl-smarc-samx6i.dtsi
@@ -48,7 +48,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment-spinor {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6qdl-tx6x.dtsi b/arch/arm/dts/imx6qdl-tx6x.dtsi
index 5e0de76fe3..ef0f935370 100644
--- a/arch/arm/dts/imx6qdl-tx6x.dtsi
+++ b/arch/arm/dts/imx6qdl-tx6x.dtsi
@@ -1,6 +1,6 @@
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
 		environment-nand {
 			status = "disabled";
diff --git a/arch/arm/dts/imx6qdl-udoo.dtsi b/arch/arm/dts/imx6qdl-udoo.dtsi
index 18398dafea..ebc103858c 100644
--- a/arch/arm/dts/imx6qdl-udoo.dtsi
+++ b/arch/arm/dts/imx6qdl-udoo.dtsi
@@ -19,7 +19,7 @@
 	compatible = "udoo,imx6qdl-udoo", "fsl,imx6q";
 
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 	};
 
 	memory {
diff --git a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
index 7586afe2fe..7ab569b789 100644
--- a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
@@ -43,7 +43,7 @@
 
 / {
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nor_flash, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6s-phytec-pbab01.dts b/arch/arm/dts/imx6s-phytec-pbab01.dts
index 95841de7b8..1cb5a237a3 100644
--- a/arch/arm/dts/imx6s-phytec-pbab01.dts
+++ b/arch/arm/dts/imx6s-phytec-pbab01.dts
@@ -19,7 +19,7 @@
 	compatible = "phytec,imx6x-pbab01", "phytec,imx6s-pfla02", "fsl,imx6dl";
 
 	chosen {
-		linux,stdout-path = &uart4;
+		stdout-path = &uart4;
 
 	};
 };
diff --git a/arch/arm/dts/imx6s-riotboard.dts b/arch/arm/dts/imx6s-riotboard.dts
index ddd0d5ba2d..9efef039a7 100644
--- a/arch/arm/dts/imx6s-riotboard.dts
+++ b/arch/arm/dts/imx6s-riotboard.dts
@@ -10,9 +10,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc4;
 		};
diff --git a/arch/arm/dts/imx6sx-sdb.dts b/arch/arm/dts/imx6sx-sdb.dts
index 7b60f9326a..88832840b2 100644
--- a/arch/arm/dts/imx6sx-sdb.dts
+++ b/arch/arm/dts/imx6sx-sdb.dts
@@ -12,7 +12,7 @@
 
 / {
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &usdhc4, "partname:barebox-environment";
 		};
diff --git a/arch/arm/dts/imx6ul-phytec-phycore-som.dtsi b/arch/arm/dts/imx6ul-phytec-phycore-som.dtsi
index 8cec1296a7..2504c9729d 100644
--- a/arch/arm/dts/imx6ul-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/imx6ul-phytec-phycore-som.dtsi
@@ -12,7 +12,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
 		environment-nand {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/imx6ul-pico-hobbit.dts b/arch/arm/dts/imx6ul-pico-hobbit.dts
index 478b2411b4..2f37b724b6 100644
--- a/arch/arm/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/dts/imx6ul-pico-hobbit.dts
@@ -2,9 +2,9 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart1;
+		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc1;
 		};
diff --git a/arch/arm/dts/imx6ull-14x14-evk.dts b/arch/arm/dts/imx6ull-14x14-evk.dts
index 9afe6402a2..6712e10739 100644
--- a/arch/arm/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/dts/imx6ull-14x14-evk.dts
@@ -2,7 +2,7 @@
 
 /{
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &environment_usdhc2;
 		};
diff --git a/arch/arm/dts/imx7d-phyboard-zeta.dts b/arch/arm/dts/imx7d-phyboard-zeta.dts
index 28fd2dc445..fbd0da2383 100644
--- a/arch/arm/dts/imx7d-phyboard-zeta.dts
+++ b/arch/arm/dts/imx7d-phyboard-zeta.dts
@@ -15,7 +15,7 @@
 	chosen {
 		stdout-path = &uart5;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &bareboxenv;
 		};
diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
index 1a92e09d14..49d4c7f294 100644
--- a/arch/arm/dts/imx7s-warp.dts
+++ b/arch/arm/dts/imx7s-warp.dts
@@ -13,7 +13,7 @@
 	chosen {
 		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &bareboxenv;
 		};
diff --git a/arch/arm/dts/rk3188-radxarock.dts b/arch/arm/dts/rk3188-radxarock.dts
index cafd4d36ed..daa75b831f 100644
--- a/arch/arm/dts/rk3188-radxarock.dts
+++ b/arch/arm/dts/rk3188-radxarock.dts
@@ -16,7 +16,7 @@
 
 / {
 	chosen {
-		linux,stdout-path = &uart2;
+		stdout-path = &uart2;
 
 		environment {
 			compatible = "barebox,environment";
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index dd991318e2..059a92c413 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -26,9 +26,9 @@
 	};
 
 	chosen {
-		linux,stdout-path = &uart0;
+		stdout-path = &uart0;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &mmc, "partname:1";
 			file-path = "barebox.env";
diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
index 8854ade434..234995bc46 100644
--- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
+++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
@@ -25,7 +25,7 @@
 	chosen {
 		stdout-path = &uart0;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &mmc, "partname:1";
 			file-path = "barebox.env";
diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts
index dfb6273cae..f0a6ae98ed 100644
--- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
@@ -23,7 +23,7 @@
 	compatible = "altr,socdk", "altr,socfpga-cyclone5", "altr,socfpga";
 
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &mmc, "partname:1";
 			file-path = "barebox.env";
diff --git a/arch/arm/dts/socfpga_cyclone5_sockit.dts b/arch/arm/dts/socfpga_cyclone5_sockit.dts
index 8830afeb9a..23e07c964c 100644
--- a/arch/arm/dts/socfpga_cyclone5_sockit.dts
+++ b/arch/arm/dts/socfpga_cyclone5_sockit.dts
@@ -25,7 +25,7 @@
 	chosen {
 		stdout-path = &uart0;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &mmc, "partname:1";
 			file-path = "barebox.env";
diff --git a/arch/arm/dts/socfpga_cyclone5_socrates.dts b/arch/arm/dts/socfpga_cyclone5_socrates.dts
index 93253af7ec..e731b55a6c 100644
--- a/arch/arm/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socrates.dts
@@ -22,7 +22,7 @@
 	chosen {
 		stdout-path = &uart0;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &mmc, "partname:1";
 			file-path = "barebox.env";
diff --git a/arch/arm/dts/tegra124-jetson-tk1.dts b/arch/arm/dts/tegra124-jetson-tk1.dts
index 00ae58fb27..00eef6cacd 100644
--- a/arch/arm/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/dts/tegra124-jetson-tk1.dts
@@ -5,7 +5,7 @@
 	chosen {
 		stdout-path = &uartd;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &emmc, "partname:boot1";
 		};
diff --git a/arch/arm/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts
index 3e7f879d68..acbdd318b1 100644
--- a/arch/arm/dts/tegra30-beaver.dts
+++ b/arch/arm/dts/tegra30-beaver.dts
@@ -16,7 +16,7 @@
 	chosen {
 		stdout-path = &uarta;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &emmc, "partname:boot1";
 		};
diff --git a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts
index 2c38bbc090..103d889b0e 100644
--- a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts
+++ b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts
@@ -7,7 +7,7 @@
 	};
 
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &spiflash, "partname:barebox-environment";
 		};
diff --git a/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts b/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts
index 5216cdc1e2..dd9d33b2da 100644
--- a/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts
+++ b/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts
@@ -22,7 +22,7 @@
 	chosen {
 		stdout-path = &uart0;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &spiflash, "partname:barebox-environment";
 		};
diff --git a/arch/mips/dts/qca4531-8devices-lima.dts b/arch/mips/dts/qca4531-8devices-lima.dts
index 7b03bc4be1..4b960e12bf 100644
--- a/arch/mips/dts/qca4531-8devices-lima.dts
+++ b/arch/mips/dts/qca4531-8devices-lima.dts
@@ -22,7 +22,7 @@
 	chosen {
 		stdout-path = &uart0;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &spiflash, "partname:barebox-environment";
 		};
diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts
index 9b0c594e87..5a392f97a7 100644
--- a/arch/mips/dts/qemu-malta.dts
+++ b/arch/mips/dts/qemu-malta.dts
@@ -7,7 +7,7 @@
 	compatible = "qemu,malta";
 
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &nor0, "partname:barebox-environment";
 		};
diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts
index 6f1ad13504..982cffc250 100644
--- a/arch/mips/dts/tplink-mr3020.dts
+++ b/arch/mips/dts/tplink-mr3020.dts
@@ -7,7 +7,7 @@
 	};
 
 	chosen {
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &spiflash, "partname:barebox-environment";
 		};
diff --git a/common/console.c b/common/console.c
index cd37d88cc4..40c26b66d9 100644
--- a/common/console.c
+++ b/common/console.c
@@ -588,4 +588,4 @@ EXPORT_SYMBOL(ctrlc);
 #endif /* ARCH_HAS_CTRC */
 
 BAREBOX_MAGICVAR_NAMED(global_linux_bootargs_console, global.linux.bootargs.console,
-		"console= argument for Linux from the linux,stdout-path property in /chosen node");
+		"console= argument for Linux from the stdout-path property in /chosen node");
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 3024b068ee..3b13086050 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -254,6 +254,12 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
 # DTC
 # ---------------------------------------------------------------------------
 
+DTC_FLAGS += -Wno-unit_address_vs_reg \
+	 -Wno-unit_address_format \
+	 -Wno-avoid_unnecessary_addr_size \
+	 -Wno-alias_paths \
+	 -Wno-pci_device_reg
+
 # Generate an assembly file to wrap the output of the device tree compiler
 quiet_cmd_dt_S_dtb = DTB     $@
 cmd_dt_S_dtb = $(srctree)/scripts/gen-dtb-s $(subst -,_,$(*F)) $< $(CONFIG_IMD) > $@