[PATCH] board: rpi: always set fdt_addr if provided by firmware

[PATCH] board: rpi: always set fdt_addr if provided by firmware

[Oleksandr Suvorov]

From: Ricardo Salveti <ricardo@foundries.io>

Otherwise if the env gets saved with an incorrect or different
fdt_addr (by moving sdcard between different rpi versions), it won't
be able to boot with the correct address.

This allows fdt_addr to always be in sync with what gets set by the
firmware.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
---

 board/raspberrypi/rpi/rpi.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 372b26b6f2..e12f8c0c31 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -318,9 +318,6 @@ static void set_fdtfile(void)
  */
 static void set_fdt_addr(void)
 {
-	if (env_get("fdt_addr"))
-		return;
-
 	if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
 		return;
 
-- 
2.31.1

Re: [PATCH] board: rpi: always set fdt_addr if provided by firmware

[Matthias Brugger]

Hi Oleksandr,

Thanks for your patch.

There was the very same patch posted already, please follow-up in that thread 
for any comments from your side:
https://patchwork.ozlabs.org/project/uboot/patch/20210512123945.25649-1-m.salvini@koansoftware.com/

Regards,
Matthias

On 25/09/2021 12:22, Oleksandr Suvorov wrote:
> From: Ricardo Salveti <ricardo@foundries.io>
> 
> Otherwise if the env gets saved with an incorrect or different
> fdt_addr (by moving sdcard between different rpi versions), it won't
> be able to boot with the correct address.
> 
> This allows fdt_addr to always be in sync with what gets set by the
> firmware.
> 
> Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> ---
> 
>   board/raspberrypi/rpi/rpi.c | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
> index 372b26b6f2..e12f8c0c31 100644
> --- a/board/raspberrypi/rpi/rpi.c
> +++ b/board/raspberrypi/rpi/rpi.c
> @@ -318,9 +318,6 @@ static void set_fdtfile(void)
>    */
>   static void set_fdt_addr(void)
>   {
> -	if (env_get("fdt_addr"))
> -		return;
> -
>   	if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
>   		return;
>   
> 

Re: [PATCH] board: rpi: always set fdt_addr if provided by firmware

[Oleksandr Suvorov]

Hello Matthias,

On Mon, Sep 27, 2021 at 3:01 PM Matthias Brugger <mbrugger@suse.com> wrote:
>
> Hi Oleksandr,
>
> Thanks for your patch.
>
> There was the very same patch posted already, please follow-up in that thread
> for any comments from your side:
> https://patchwork.ozlabs.org/project/uboot/patch/20210512123945.25649-1-m.salvini@koansoftware.com/

Thank you, I missed that patch. I'll follow up on that thread.
>
> Regards,
> Matthias
>
> On 25/09/2021 12:22, Oleksandr Suvorov wrote:
> > From: Ricardo Salveti <ricardo@foundries.io>
> >
> > Otherwise if the env gets saved with an incorrect or different
> > fdt_addr (by moving sdcard between different rpi versions), it won't
> > be able to boot with the correct address.
> >
> > This allows fdt_addr to always be in sync with what gets set by the
> > firmware.
> >
> > Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
> > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> > ---
> >
> >   board/raspberrypi/rpi/rpi.c | 3 ---
> >   1 file changed, 3 deletions(-)
> >
> > diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
> > index 372b26b6f2..e12f8c0c31 100644
> > --- a/board/raspberrypi/rpi/rpi.c
> > +++ b/board/raspberrypi/rpi/rpi.c
> > @@ -318,9 +318,6 @@ static void set_fdtfile(void)
> >    */
> >   static void set_fdt_addr(void)
> >   {
> > -     if (env_get("fdt_addr"))
> > -             return;
> > -
> >       if (fdt_magic(fw_dtb_pointer) != FDT_MAGIC)
> >               return;
> >
> >
>


-- 
Best regards
Oleksandr

Oleksandr Suvorov
cryosay@gmail.com