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

common: board: Dont relocate FDT incase of CONFIG_OF_EMBED

Browse Source 
Don't relocate fdt in case of CONFIG_OF EMBED as the fdt is
already embedded with u-boot image.
Update fdt_blob after relocation as the fdt will be copied
during u-boot relocation.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com> (QEMU x86)
Tested-by: Thomas Chou <thomas@wytron.com.tw> (Nios2)
Acked-by: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Siva Durga Prasad Paladugu
2015-12-03 15:46:03 +01:00
committed by Tom Rini
parent b4857aa901
commit e9acb9ea43
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/board_f.c
View File

@@ -524,6 +524,7 @@ static int reserve_global_data(void)
static int reserve_fdt(void) static int reserve_fdt(void)
{ {
#ifndef CONFIG_OF_EMBED
/* /*
* If the device tree is sitting immediately above our image then we * If the device tree is sitting immediately above our image then we
* must relocate it. If it is embedded in the data section, then it * must relocate it. If it is embedded in the data section, then it
@@ -537,6 +538,7 @@ static int reserve_fdt(void)
debug("Reserving %lu Bytes for FDT at: %08lx\n", debug("Reserving %lu Bytes for FDT at: %08lx\n",
gd->fdt_size, gd->start_addr_sp); gd->fdt_size, gd->start_addr_sp);
} }
#endif
return 0; return 0;
} }
@@ -674,12 +676,14 @@ static int setup_dram_config(void)
static int reloc_fdt(void) static int reloc_fdt(void)
{ {
#ifndef CONFIG_OF_EMBED
if (gd->flags & GD_FLG_SKIP_RELOC) if (gd->flags & GD_FLG_SKIP_RELOC)
return 0; return 0;
if (gd->new_fdt) { if (gd->new_fdt) {
memcpy(gd->new_fdt, gd->fdt_blob, gd->fdt_size); memcpy(gd->new_fdt, gd->fdt_blob, gd->fdt_size);
gd->fdt_blob = gd->new_fdt; gd->fdt_blob = gd->new_fdt;
} }
#endif
return 0; return 0;
} }

8
common/board_r.c
View File

@@ -168,6 +168,14 @@ static int initr_reloc_global_data(void)
*/ */
gd->env_addr += gd->relocaddr - CONFIG_SYS_MONITOR_BASE; gd->env_addr += gd->relocaddr - CONFIG_SYS_MONITOR_BASE;
#endif #endif
#ifdef CONFIG_OF_EMBED
/*
* The fdt_blob needs to be moved to new relocation address
* incase of FDT blob is embedded with in image
*/
gd->fdt_blob += gd->reloc_off;
#endif
return 0; return 0;
} }