From c970dffedb9f7bf76d67157c8ceba64496b0c64a Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sat, 6 Sep 2014 23:39:00 +0900 Subject: [PATCH] generic_board: do not set gd->fdt_blob unless CONFIG_OF_CONTROL=y gd->fdt_blob is used for FDT control of U-Boot. If CONFIG_OF_CONTROL is not defined, it is useless. Signed-off-by: Masahiro Yamada Cc: Simon Glass Acked-by: Simon Glass --- common/board_f.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 5f33bce4a2..e6aa298d5a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -341,21 +341,23 @@ static int setup_ram_buf(void) static int setup_fdt(void) { -#ifdef CONFIG_OF_EMBED +#ifdef CONFIG_OF_CONTROL +# ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ gd->fdt_blob = __dtb_dt_begin; -#elif defined CONFIG_OF_SEPARATE +# elif defined CONFIG_OF_SEPARATE /* FDT is at end of image */ gd->fdt_blob = (ulong *)&_end; -#elif defined(CONFIG_OF_HOSTFILE) +# elif defined(CONFIG_OF_HOSTFILE) if (read_fdt_from_file()) { puts("Failed to read control FDT\n"); return -1; } -#endif +# endif /* Allow the early environment to override the fdt address */ gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16, (uintptr_t)gd->fdt_blob); +#endif return 0; }