diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-23 12:19:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-23 12:19:07 -0400 |
| commit | d0ffda8ed208ff2957cd09ccc37e2d6dff81523e (patch) | |
| tree | 25977d0f0a3879b5a145c642748dce7e54b3e8b4 /drivers/core/root.c | |
| parent | 5877d8f398de26617be6f1f57bc30c49e9f90ebb (diff) | |
| parent | 55bc080e799ac18802a791bd5ce5d83a136da6e3 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'drivers/core/root.c')
| -rw-r--r-- | drivers/core/root.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/core/root.c b/drivers/core/root.c index 93ab5682968..33cfde6a5c3 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -44,8 +44,10 @@ struct udevice *dm_root(void) void dm_fixup_for_gd_move(struct global_data *new_gd) { /* The sentinel node has moved, so update things that point to it */ - new_gd->uclass_root.next->prev = &new_gd->uclass_root; - new_gd->uclass_root.prev->next = &new_gd->uclass_root; + if (gd->dm_root) { + new_gd->uclass_root.next->prev = &new_gd->uclass_root; + new_gd->uclass_root.prev->next = &new_gd->uclass_root; + } } fdt_addr_t dm_get_translation_offset(void) |