diff --git a/Documentation/devicetree/bindings/barebox/barebox,environment.rst b/Documentation/devicetree/bindings/barebox/barebox,environment.rst index 029e7f0..918efd1 100644 --- a/Documentation/devicetree/bindings/barebox/barebox,environment.rst +++ b/Documentation/devicetree/bindings/barebox/barebox,environment.rst @@ -30,7 +30,7 @@ .. 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 479c6cf..d0860b8 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 13eb91c..f939cf6 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 0413724..e03ae2a 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 d608f63..6a04429 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 cf2eef3..cb2d30a 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 5b8bb5d..465d3fa 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 3681b84..7fe283c 100644 --- a/arch/arm/dts/at91sam9263ek.dts +++ b/arch/arm/dts/at91sam9263ek.dts @@ -1,7 +1,7 @@ #include / { 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 f7ad55c..83e1d5d 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 8d79471..9296e90 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 cb02a1d..abfbd50 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 bde3031..5147195 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 2ed24b6..d925ba4 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 2b1b54a..7a133a5 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 f743f17..d34b59f 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 6998e4c..53b98e3 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 f363af9..24bbd67 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 e91c7d0..c4c17c2 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 4fe1744..fe33604 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 7f4d2b4..5bfa470 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 9520509..cdb0334 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 4b77838..d10fbf6 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 873e9d6..0a7a718 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 3576211..2b9097c 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 3bbb60b..76c940b 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 3217a5b..8f886c4 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 e707eb9..b10acf2 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 8906558..6c41ab7 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 69d46b4..9391c1d 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 bcb3dd7..4724a02 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 1f92c15..21180df 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 fe03589..ddb220f 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 0606727..d96f057 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 5c7bcd3..73878cd 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 5f8e489..23e08f7 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 26c685c..19fe788 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 76e55e0..53fdb72 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 ec14415..3c197dd 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 10b0002..ec3d364 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 31a12fe..363da66 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 5e0de76..ef0f935 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 18398da..ebc1038 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 7586afe..7ab569b 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 95841de..1cb5a23 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 ddd0d5b..9efef03 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 7b60f93..8883284 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 8cec129..2504c97 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 478b241..2f37b72 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 9afe640..6712e10 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 28fd2dc..fbd0da2 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 1a92e09..49d4c7f 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 cafd4d3..daa75b8 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 dd99131..059a92c 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 8854ade..234995b 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 dfb6273..f0a6ae9 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 8830afe..23e07c9 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 93253af..e731b55 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 00ae58f..00eef6c 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 3e7f879..acbdd31 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 2c38bbc..103d889 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 5216cdc..dd9d33b 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 7b03bc4..4b960e1 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 9b0c594..5a392f9 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 6f1ad13..982cffc 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 cd37d88..40c26b6 100644 --- a/common/console.c +++ b/common/console.c @@ -588,4 +588,4 @@ #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 3024b06..3b13086 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -254,6 +254,12 @@ # 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) > $@