diff options
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/common/board_r.c b/common/board_r.c index fbabc89..8e7a3ac 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -273,27 +273,10 @@ static int initr_malloc(void) #ifdef CONFIG_DM static int initr_dm(void) { - int ret; - - ret = dm_init(); - if (ret) { - debug("dm_init() failed: %d\n", ret); - return ret; - } - ret = dm_scan_platdata(false); - if (ret) { - debug("dm_scan_platdata() failed: %d\n", ret); - return ret; - } -#ifdef CONFIG_OF_CONTROL - ret = dm_scan_fdt(gd->fdt_blob, false); - if (ret) { - debug("dm_scan_fdt() failed: %d\n", ret); - return ret; - } -#endif - - return 0; + /* Save the pre-reloc driver model and start a new one */ + gd->dm_root_f = gd->dm_root; + gd->dm_root = NULL; + return dm_init_and_scan(false); } #endif |