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/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/imx25-karo-tx25.dts b/arch/arm/dts/imx25-karo-tx25.dts index d447f97..9296e90 100644 --- a/arch/arm/dts/imx25-karo-tx25.dts +++ b/arch/arm/dts/imx25-karo-tx25.dts @@ -19,7 +19,7 @@ chosen { 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 b67af8a..abfbd50 100644 --- a/arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts +++ b/arch/arm/dts/imx27-phytec-phycard-s-rdk-bb.dts @@ -8,7 +8,7 @@ chosen { 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 2493c94..d925ba4 100644 --- a/arch/arm/dts/imx53-ccxmx53.dtsi +++ b/arch/arm/dts/imx53-ccxmx53.dtsi @@ -18,7 +18,7 @@ chosen { stdout-path = &uart1; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &nfc, "partname: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 d60f633..c4c17c2 100644 --- a/arch/arm/dts/imx53-voipac-dmm-668.dtsi +++ b/arch/arm/dts/imx53-voipac-dmm-668.dtsi @@ -2,7 +2,7 @@ chosen { 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 7e3dcbb..5bfa470 100644 --- a/arch/arm/dts/imx6dl-hummingboard.dts +++ b/arch/arm/dts/imx6dl-hummingboard.dts @@ -12,7 +12,7 @@ chosen { stdout-path = &uart1; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &usdhc2, "partname:barebox-environment"; }; diff --git a/arch/arm/dts/imx6dl-wandboard.dts b/arch/arm/dts/imx6dl-wandboard.dts index ddfd415..0a7a718 100644 --- a/arch/arm/dts/imx6dl-wandboard.dts +++ b/arch/arm/dts/imx6dl-wandboard.dts @@ -6,7 +6,7 @@ chosen { stdout-path = &uart1; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &environment_usdhc3; }; diff --git a/arch/arm/dts/imx6q-hummingboard.dts b/arch/arm/dts/imx6q-hummingboard.dts index 0dcc424..b10acf2 100644 --- a/arch/arm/dts/imx6q-hummingboard.dts +++ b/arch/arm/dts/imx6q-hummingboard.dts @@ -12,7 +12,7 @@ chosen { 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-sabresd.dts b/arch/arm/dts/imx6q-sabresd.dts index cf264f4..21180df 100644 --- a/arch/arm/dts/imx6q-sabresd.dts +++ b/arch/arm/dts/imx6q-sabresd.dts @@ -23,7 +23,7 @@ chosen { 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 5a0fa6b..9fc364e 100644 --- a/arch/arm/dts/imx6q-var-custom.dts +++ b/arch/arm/dts/imx6q-var-custom.dts @@ -28,7 +28,7 @@ chosen { 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 7edf956..d96f057 100644 --- a/arch/arm/dts/imx6q-wandboard.dts +++ b/arch/arm/dts/imx6q-wandboard.dts @@ -6,7 +6,7 @@ chosen { stdout-path = &uart1; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &environment_usdhc3; }; diff --git a/arch/arm/dts/imx6qdl-gw54xx.dtsi b/arch/arm/dts/imx6qdl-gw54xx.dtsi index 6d120d7..23e08f7 100644 --- a/arch/arm/dts/imx6qdl-gw54xx.dtsi +++ b/arch/arm/dts/imx6qdl-gw54xx.dtsi @@ -15,7 +15,7 @@ chosen { 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-sabrelite.dtsi b/arch/arm/dts/imx6qdl-sabrelite.dtsi index 99456da..ec3d364 100644 --- a/arch/arm/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/dts/imx6qdl-sabrelite.dtsi @@ -18,7 +18,7 @@ chosen { stdout-path = &uart2; - environment@0 { + environment { compatible = "barebox,environment"; device-path = &flash, "partname:barebox-environment"; }; 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-riotboard.dts b/arch/arm/dts/imx6s-riotboard.dts index b0a561d..9efef03 100644 --- a/arch/arm/dts/imx6s-riotboard.dts +++ b/arch/arm/dts/imx6s-riotboard.dts @@ -12,7 +12,7 @@ chosen { 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-pico-hobbit.dts b/arch/arm/dts/imx6ul-pico-hobbit.dts index c6fe6d0..2f37b72 100644 --- a/arch/arm/dts/imx6ul-pico-hobbit.dts +++ b/arch/arm/dts/imx6ul-pico-hobbit.dts @@ -4,7 +4,7 @@ chosen { 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/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts index 0411735..059a92c 100644 --- a/arch/arm/dts/socfpga_arria10_achilles.dts +++ b/arch/arm/dts/socfpga_arria10_achilles.dts @@ -28,7 +28,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_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"; };