summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-07-03 09:05:52 -0600
committerTom Rini <[email protected]>2024-07-03 09:05:52 -0600
commit4d3383623dd04be230ebb962c2f79bb3f3d502d9 (patch)
tree8c0b34c49d3a3cee72f6d9680ea0afc93d09f793 /common
parent65fbdab27224ee3943a89496b21862db83c34da2 (diff)
parentc85a05a5d87ce6f077c41d7e63a4a7953ddb351c (diff)
Merge tag 'dm-pull-2jun24-take2' of https://source.denx.de/u-boot/custodians/u-boot-dm
buildman CI improvements binman fixes and assumed size partial tools fixes for Python 3.12 patman enhancements
Diffstat (limited to 'common')
-rw-r--r--common/board_r.c3
1 files changed, 1 insertions, 2 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;