diff options
| -rw-r--r-- | common/board_r.c | 3 | ||||
| -rw-r--r-- | include/asm-generic/global_data.h | 4 | ||||
| -rw-r--r-- | test/dm/core.c | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/common/board_r.c b/common/board_r.c index c823cd262f1..d4ba245ac69 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -230,8 +230,7 @@ static int initr_dm(void) oftree_reset(); - /* Save the pre-reloc driver model and start a new one */ - gd->dm_root_f = gd->dm_root; + /* Drop the pre-reloc driver model and start a new one */ gd->dm_root = NULL; #ifdef CONFIG_TIMER gd->timer = NULL; diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index fcc3c6e14ca..aa336d63e3a 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -196,10 +196,6 @@ struct global_data { */ struct udevice *dm_root; /** - * @dm_root_f: pre-relocation root instance - */ - struct udevice *dm_root_f; - /** * @uclass_root_s: * head of core tree when uclasses are not in read-only memory. * diff --git a/test/dm/core.c b/test/dm/core.c index 4741c81bcc1..dbad1b317db 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -1006,7 +1006,6 @@ static int dm_test_uclass_before_ready(struct unit_test_state *uts) ut_assertok(uclass_get(UCLASS_TEST, &uc)); gd->dm_root = NULL; - gd->dm_root_f = NULL; memset(&gd->uclass_root, '\0', sizeof(gd->uclass_root)); ut_asserteq_ptr(NULL, uclass_find(UCLASS_TEST)); |