[PATCH] common/board_f: make sure to call fix_fdt() before reserve_fdt()

Atish Patra atishp at atishpatra.org
Sun Aug 9 22:20:42 CEST 2020


On Wed, Aug 5, 2020 at 2:01 AM Pragnesh Patel <pragnesh.patel at sifive.com> wrote:
>
> There may be a chance that board specific fix_fdt() will change the
> size of FDT blob so it's safe to call reserve_fdt() after fix_fdt()
> otherwise global data (gd) will overwrite with FDT blob values.
>
> Signed-off-by: Pragnesh Patel <pragnesh.patel at sifive.com>
> ---
>  common/board_f.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/common/board_f.c b/common/board_f.c
> index 88ff0424a7..7ae01e9fff 100644
> --- a/common/board_f.c
> +++ b/common/board_f.c
> @@ -956,6 +956,9 @@ static const init_fnc_t init_sequence_f[] = {
>          *  - board info struct
>          */
>         setup_dest_addr,
> +#ifdef CONFIG_OF_BOARD_FIXUP
> +       fix_fdt,
> +#endif
>  #ifdef CONFIG_PRAM
>         reserve_pram,
>  #endif
> @@ -984,9 +987,6 @@ static const init_fnc_t init_sequence_f[] = {
>         setup_board_part2,
>  #endif
>         display_new_sp,
> -#ifdef CONFIG_OF_BOARD_FIXUP
> -       fix_fdt,
> -#endif
>         INIT_FUNC_WATCHDOG_RESET
>         reloc_fdt,
>         reloc_bootstage,
> --
> 2.17.1
>


Reviewed-by: Atish Patra <atish.patra at wdc.com>
-- 
Regards,
Atish


More information about the U-Boot mailing list