common: board: Dont relocate FDT incase of CONFIG_OF_EMBED
PATCH v4 1/1 common: board: Dont relocate FDT incase of CONFIG_OF_EMBED
From: Siva Durga Prasad Paladugu <[email protected]>
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.
---
Changes in v4:
- board: Update fdt_blob after relocation. Updating it before relocation may cause issue with some devices if they try to use it before it actually relocated
Changes in v3:
- Remove maybe unused and move ifdefs to functions directly - reported by Simon
Changes in v2:
- Fix commit message reported by Alexey
common/board_f.c | 4 ++++ common/board_r.c | 8 ++++++++ 2 files changed, 12 insertions(+)
common/board_f.c +4 -0
@@ -510,6 +510,7 @@ static int reserve_global_data(void)static int reserve_fdt (void ) { +#ifndef CONFIG_OF_EMBED /* * 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
@@ -523,6 +524,7 @@ static int reserve_fdt(void)debug ("Reserving %lu Bytes for FDT at: %08lx\n" , gd->fdt_size, gd->start_addr_sp); } +#endif return 0 ; }
@@ -660,12 +662,14 @@ static int setup_dram_config(void)static int reloc_fdt (void ) { +#ifndef CONFIG_OF_EMBED 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; } +#endif return 0 ; }
common/board_r.c +8 -0
@@ -165,6 +165,14 @@ static int initr_reloc_global_data(void)*/ gd->env_addr += gd->relocaddr -CONFIG_SYS_MONITOR_BASE ;#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 ; }
Signature · 1 line
1.9.1
PATCH v4 1/1 common: board: Dont relocate FDT incase of CONFIG_OF_EMBED
Quoted 7 lines · Michal Simek
From: Siva Durga Prasad Paladugu <[email protected]>
Don't relocate fdt in case of
CONFIG_OFEMBED as the fdt is already embedded with u-boot image.
Updatefdt_blobafter relocation as the fdt will be copied during u-boot relocation.
Quoted 8 lines
Signed-off-by Siva Durga Prasad Paladugu <[email protected]>Signed-off-by Michal Simek <[email protected]>Reviewed-by Alexey Brodkin <[email protected]>Reviewed-by Bin Meng <[email protected]>Tested-by Bin Meng <[email protected]> (QEMU x86)Tested-by Thomas Chou <[email protected]> (Nios2)Acked-by Thomas Chou <[email protected]>Acked-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/c7345d4a/attachment.sig>