summaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-12 22:46:36 -0500
committerTom Rini <trini@konsulko.com>2019-11-20 12:24:50 -0500
commit8d8ee47e03ef23b0d0e842ea455a30bf0d2023b9 (patch)
tree4a03ee3c6d1f5fd8995c910200aeaa733b0b31c0 /common/board_r.c
parent30b59dd8ba1b5272e4ac058f2c3ed768085c15d6 (diff)
env: Add CONFIG_SYS_RELOC_GD_ENV_ADDR symbol
Today in initr_reloc_global_data() we use some non-obvious tests to determine if we need to relocate the env_addr within gd or not. In order to facilitate migration of other symbols to Kconfig we need to introduce a new symbol for this particular use case. Cc: Wolfgang Denk <wd@denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/board_r.c b/common/board_r.c
index c1ecb06b74..65720849cd 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -144,7 +144,7 @@ static int initr_reloc_global_data(void)
*/
fixup_cpu();
#endif
-#if !defined(CONFIG_ENV_ADDR) || defined(ENV_IS_EMBEDDED)
+#ifdef CONFIG_SYS_RELOC_GD_ENV_ADDR
/*
* Relocate the early env_addr pointer unless we know it is not inside
* the binary. Some systems need this and for the rest, it doesn't hurt.