[PATCH v2 4/4] ARM: riotboard: drop static barebox-environment handling

[Ahmad Fatoum]

Hi,

On 4/24/25 7:49 PM, Alexander Shiyan wrote:
> Hello All!
> 
> What happens if the required GUID identifier is both in the SD card
> and in the MMC?

The order of preference is:

  - barebox,environment node in the device tree
  - a suitable partition on the boot medium
  - a suitable partition on a non-boot medium

The latter two only if $global.env.autoprobe is 1.

Cheers,
Ahmad

> 
> Thanks!
> 
> чт, 24 апр. 2025 г. в 11:02, Ahmad Fatoum <a.fatoum at pengutronix.de>:
>>
>> Hi Marco,
>>
>> On 23.04.25 16:09, Marco Felsch wrote:
>>> 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. This
>>> allows the BSP integrators to provide a proper GPT or if no GPT was
>>> provided we fallback to the autom. minimal GPT mechanism added recently.
>>>
>>> This also fixes environment handling if booted from a SD card since SD
>>> card boots make use of eMMC barebox environment at the moment.
>>
>> You didn't fully address my suggestion[1] on v1. Why not keep around the existing
>> environment as a fallback?
>>
>> https://lore.barebox.org/barebox/1ff0f545-effa-4b87-81b7-524919333777@pengutronix.de/
>>
>> Thanks,
>> Ahmad
>>
>>>
>>> Signed-off-by: Marco Felsch <m.felsch at pengutronix.de>
>>> ---
>>> v2:
>>> - Adapt commit message
>>>
>>>  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 at 0 {
>>>               label = "barebox";
>>>               reg = <0x0 0xe0000>;
>>>       };
>>> -
>>> -     environment_usdhc4: partition at e0000 {
>>> -             label = "barebox-environment";
>>> -             reg = <0xe0000 0x20000>;
>>> -     };
>>>  };
>>>
>>>  &clks {
>>
>>
>> --
>> Pengutronix e.K.                           |                             |
>> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
>> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
>> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
>>
> 

-- 
Pengutronix e.K.                  |                             |
Steuerwalder Str. 21              | http://www.pengutronix.de/  |
31137 Hildesheim, Germany         | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686  | Fax:   +49-5121-206917-5555 |