On Fri, Nov 27, 2015 at 3:28 PM, Michal Simek <michal.si...@xilinx.com> wrote: > From: Siva Durga Prasad Paladugu <siva.durga.palad...@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 <siva...@xilinx.com> > Signed-off-by: Michal Simek <michal.si...@xilinx.com> > Reviewed-by: Alexey Brodkin <abrod...@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 > 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, > --
Reviewed-by: Bin Meng <bmeng...@gmail.com> Tested on QEMU x86 Tested-by: Bin Meng <bmeng...@gmail.com> _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot