diff options
| -rw-r--r-- | common/board_r.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/common/board_r.c b/common/board_r.c index 56eb60fa275..00926dcb1e1 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -150,13 +150,13 @@ static int initr_reloc_global_data(void)  	 */  	gd->env_addr += gd->reloc_off;  #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 +	if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) +		gd->fdt_blob += gd->reloc_off; +  #ifdef CONFIG_EFI_LOADER  	/*  	 * On the ARM architecture gd is mapped to a fixed register (r9 or x18). | 
