[U-Boot] [PATCH v2] common: board_f: Dont relocate FDT incase of CONFIG_OF_EMBED

[Simon Glass]

Hi Michal,

On 27 November 2015 at 00:28, Michal Simek <michal.simek at xilinx.com> wrote:
> From: Siva Durga Prasad Paladugu <siva.durga.paladugu at xilinx.com>
>
> Don't relocate fdt in case of CONFIG_OF EMBED as the fdt is
> already embedded with u-boot image. Also update the fdt_blob
> correctly in this case
>
> Signed-off-by: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> Reviewed-by: Alexey Brodkin <abrodkin at synopsys.com>
> ---
>
> Changes in v2:
> - Fix commit message reported by Alexey
>
>  common/board_f.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/common/board_f.c b/common/board_f.c
> index b035c90ff3b7..91bf8beea1c6 100644
> --- a/common/board_f.c
> +++ b/common/board_f.c
> @@ -508,7 +508,7 @@ static int reserve_global_data(void)
>         return 0;
>  }
>
> -static int reserve_fdt(void)
> +static int __maybe_unused reserve_fdt(void)
>  {
>         /*
>          * If the device tree is sitting immediately above our image then we
> @@ -658,7 +658,7 @@ static int setup_dram_config(void)
>         return 0;
>  }
>
> -static int reloc_fdt(void)
> +static int __maybe_unused reloc_fdt(void)
>  {
>         if (gd->flags & GD_FLG_SKIP_RELOC)
>                 return 0;
> @@ -687,6 +687,9 @@ static int setup_reloc(void)
>         gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
>  #endif
>  #endif
> +#ifdef CONFIG_OF_EMBED
> +       gd->fdt_blob += gd->reloc_off;
> +#endif
>         memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
>
>         debug("Relocation Offset is: %08lx\n", gd->reloc_off);
> @@ -938,7 +941,9 @@ static init_fnc_t init_sequence_f[] = {
>  #endif
>         setup_machine,
>         reserve_global_data,
> +#ifndef CONFIG_OF_EMBED
>         reserve_fdt,
> +#endif

Can you please put the #ifdef in the function? At some point we are
hoping to get rid of all these #ifdefs.

>         reserve_arch,
>         reserve_stacks,
>         setup_dram_config,
> @@ -955,7 +960,9 @@ static init_fnc_t init_sequence_f[] = {
>         setup_board_extra,
>  #endif
>         INIT_FUNC_WATCHDOG_RESET
> +#ifndef CONFIG_OF_EMBED
>         reloc_fdt,
> +#endif
>         setup_reloc,
>  #if defined(CONFIG_X86) || defined(CONFIG_ARC)
>         copy_uboot_to_ram,
> --
> 1.9.1
>

Regards,
Simon