diff mbox

[U-Boot] common: board_f: Dont relocate FDT incase of CONFIG_OF_EMBED

Message ID 1ae39c3f018dff7e30c06f37e14507e4d87de080.1448531680.git.michal.simek@xilinx.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Michal Simek Nov. 26, 2015, 9:54 a.m. UTC 
From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>

Done relocate fdt incase of CONFIG_OF EMBED as the fdt is
already embedded with u-boot image. Also update the fdt_blob
correctly in this case

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 common/board_f.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Alexey Brodkin Nov. 26, 2015, 11:18 a.m. UTC | #1 
Hi Michal,

On Thu, 2015-11-26 at 10:54 +0100, Michal Simek wrote:
> From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
> 
> Done relocate fdt incase of CONFIG_OF EMBED as the fdt is

Probably it was meant to be something like:
------------------->8-------------------
__Don't__ relocate fdt in__case of CONFIG_OF EMBED as the fdt is
------------------->8-------------------

Otherwise,
Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com>

-Alexey
Michal Simek Nov. 26, 2015, 11:28 a.m. UTC | #2 
On 26.11.2015 12:18, Alexey Brodkin wrote:
> Hi Michal,
> 
> On Thu, 2015-11-26 at 10:54 +0100, Michal Simek wrote:
>> From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
>>
>> Done relocate fdt incase of CONFIG_OF EMBED as the fdt is
> 
> Probably it was meant to be something like:
> ------------------->8-------------------
> __Don't__ relocate fdt in__case of CONFIG_OF EMBED as the fdt is
> ------------------->8-------------------
> 
> Otherwise,
> Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com>

Ah yeah. Will fix it in v2.

Thanks,
Michal
diff mbox

Patch

diff --git a/common/board_f.c b/common/board_f.c
index b035c90ff3b7..91bf8beea1c6 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -508,7 +508,7 @@  static int reserve_global_data(void)
 	return 0;
 }
 
-static int reserve_fdt(void)
+static int __maybe_unused reserve_fdt(void)
 {
 	/*
 	 * If the device tree is sitting immediately above our image then we
@@ -658,7 +658,7 @@  static int setup_dram_config(void)
 	return 0;
 }
 
-static int reloc_fdt(void)
+static int __maybe_unused reloc_fdt(void)
 {
 	if (gd->flags & GD_FLG_SKIP_RELOC)
 		return 0;
@@ -687,6 +687,9 @@  static int setup_reloc(void)
 	gd->reloc_off = gd->relocaddr - (CONFIG_SYS_TEXT_BASE + 0x400);
 #endif
 #endif
+#ifdef CONFIG_OF_EMBED
+	gd->fdt_blob += gd->reloc_off;
+#endif
 	memcpy(gd->new_gd, (char *)gd, sizeof(gd_t));
 
 	debug("Relocation Offset is: %08lx\n", gd->reloc_off);
@@ -938,7 +941,9 @@  static init_fnc_t init_sequence_f[] = {
 #endif
 	setup_machine,
 	reserve_global_data,
+#ifndef CONFIG_OF_EMBED
 	reserve_fdt,
+#endif
 	reserve_arch,
 	reserve_stacks,
 	setup_dram_config,
@@ -955,7 +960,9 @@  static init_fnc_t init_sequence_f[] = {
 	setup_board_extra,
 #endif
 	INIT_FUNC_WATCHDOG_RESET
+#ifndef CONFIG_OF_EMBED
 	reloc_fdt,
+#endif
 	setup_reloc,
 #if defined(CONFIG_X86) || defined(CONFIG_ARC)
 	copy_uboot_to_ram,