aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-11-13 14:21:58 -0700
committerSimon Glass <sjg@chromium.org>2016-12-02 20:53:19 -0700
commit2f11cd9121658b65a1d0789b37f290b207993a34 (patch)
treec90d05480e74767fefc3b1ba0e855070a3a5c977 /common
parenta9401b2bc93a750d1566174b18d23bcdc2a45b7b (diff)
downloadu-boot-2f11cd9121658b65a1d0789b37f290b207993a34.zip
u-boot-2f11cd9121658b65a1d0789b37f290b207993a34.tar.gz
u-boot-2f11cd9121658b65a1d0789b37f290b207993a34.tar.bz2
dm: core: Handle global_data moving in SPL
When CONFIG_SPL_STACK_R is enabled, and spl_init() is called before board_init_r(), spl_relocate_stack_gd() will move global_data to a new place in memory. This affects driver model since it uses a list for the uclasses. Unless this is updated the list will become invalid. When looking for a non-existent uclass, such as when adding a new one, the loop in uclass_find() may continue forever, thus causing a hang. Add a function to correct this rather obscure bug. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 32b9f1e..9bcbd09 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -513,6 +513,9 @@ ulong spl_relocate_stack_gd(void)
ptr = CONFIG_SPL_STACK_R_ADDR - roundup(sizeof(gd_t),16);
new_gd = (gd_t *)ptr;
memcpy(new_gd, (void *)gd, sizeof(gd_t));
+#if CONFIG_IS_ENABLED(DM)
+ dm_fixup_for_gd_move(new_gd);
+#endif
#if !defined(CONFIG_ARM)
gd = new_gd;
#endif