dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

generic_board: do not set gd->fdt_blob unless CONFIG_OF_CONTROL=y

Browse Source 
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 <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada
2014-09-06 23:39:00 +09:00
committed by Tom Rini
parent 8e71443211
commit c970dffedb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/board_f.c
View File

@@ -341,21 +341,23 @@ static int setup_ram_buf(void)
static int setup_fdt(void) static int setup_fdt(void)
{ {
#ifdef CONFIG_OF_EMBED #ifdef CONFIG_OF_CONTROL
# ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */ /* Get a pointer to the FDT */
gd->fdt_blob = __dtb_dt_begin; gd->fdt_blob = __dtb_dt_begin;
#elif defined CONFIG_OF_SEPARATE # elif defined CONFIG_OF_SEPARATE
/* FDT is at end of image */ /* FDT is at end of image */
gd->fdt_blob = (ulong *)&_end; gd->fdt_blob = (ulong *)&_end;
#elif defined(CONFIG_OF_HOSTFILE) # elif defined(CONFIG_OF_HOSTFILE)
if (read_fdt_from_file()) { if (read_fdt_from_file()) {
puts("Failed to read control FDT\n"); puts("Failed to read control FDT\n");
return -1; return -1;
} }
#endif # endif
/* Allow the early environment to override the fdt address */ /* Allow the early environment to override the fdt address */
gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16, gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16,
(uintptr_t)gd->fdt_blob); (uintptr_t)gd->fdt_blob);
#endif
return 0; return 0;
} }