Since commit 9f868f78bc54 ("environment: use barebox environment from
GPT partitions") barebox can try to find the barebox-environment based
on a GPT partition GUID.

Make use of this mechanism and drop the barebox local of-partition for
the eMMC device and let the user-space provide the correct
barebox-environment location if any.

This also fixes environment handling if booted from a SD card since SD
card boots make use of eMMC barebox environment at the moment.

Signed-off-by: Marco Felsch <m.fel...@pengutronix.de>
---
 arch/arm/dts/imx6s-riotboard.dts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/arm/dts/imx6s-riotboard.dts b/arch/arm/dts/imx6s-riotboard.dts
index 57817c1197a7..cca34d6dba95 100644
--- a/arch/arm/dts/imx6s-riotboard.dts
+++ b/arch/arm/dts/imx6s-riotboard.dts
@@ -11,11 +11,6 @@
 / {
        chosen {
                stdout-path = &uart2;
-
-               environment {
-                       compatible = "barebox,environment";
-                       device-path = &environment_usdhc4;
-               };
        };
 };
 
@@ -31,11 +26,6 @@ partition@0 {
                label = "barebox";
                reg = <0x0 0xe0000>;
        };
-
-       environment_usdhc4: partition@e0000 {
-               label = "barebox-environment";
-               reg = <0xe0000 0x20000>;
-       };
 };
 
 &clks {
-- 
2.39.5


Reply via email to