Hi Bin, On 4 August 2015 at 12:34, Simon Glass <s...@chromium.org> wrote: > This was missed in the patch 'Add a way to skip relocation'. Add it in now. > > I hope to squash this patch into the earlier one before sending to mainline. > > Signed-off-by: Simon Glass <s...@chromium.org> > --- > > Changes in v3: > - Add new patch to allow device tree relocation to be disabled > > Changes in v2: None > > common/board_f.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/common/board_f.c b/common/board_f.c > index c596083..c7cc67c 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -654,6 +654,8 @@ static int setup_dram_config(void) > > static int reloc_fdt(void) > { > + if (gd->flags & GD_FLG_SKIP_RELOC) > + return 0; > if (gd->new_fdt) { > memcpy(gd->new_fdt, gd->fdt_blob, gd->fdt_size); > gd->fdt_blob = gd->new_fdt; > -- > 2.5.0.rc2.392.g76e840b >
I should have just squashed this in before sending the series. Anyway, I can do it either in the next version, or when applying. Regards, Simon _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot