diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-29 16:06:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-29 16:06:19 -0400 |
| commit | 97c0a9c5708dc60d82cad721a8b882f0ce37e83d (patch) | |
| tree | 03b432017b1ee4aa9a76cf17ce0dad329ec18ad8 /common/board_r.c | |
| parent | d779fc399ce838160fb842543a53524b04564eda (diff) | |
| parent | 76f921eb95d5b814f973a263187db509d6f03903 (diff) | |
Merge branch '2022-09-29-assorted-fixes'
- Assorted fixes we want to include before the release.
Diffstat (limited to 'common/board_r.c')
| -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). |