|
@@ -7,7 +7,6 @@
|
|
|
#include <common.h>
|
|
|
#include <console.h>
|
|
|
#include <dm.h>
|
|
|
-#include <asm/state.h>
|
|
|
#include <dm/root.h>
|
|
|
#include <dm/test.h>
|
|
|
#include <dm/uclass-internal.h>
|
|
@@ -46,9 +45,9 @@ static int dm_test_pre_run(struct unit_test_state *uts)
|
|
|
uts->force_fail_alloc = false;
|
|
|
uts->skip_post_probe = false;
|
|
|
gd->dm_root = NULL;
|
|
|
- if (!CONFIG_IS_ENABLED(OF_PLATDATA))
|
|
|
+ if (IS_ENABLED(CONFIG_UT_DM) && !CONFIG_IS_ENABLED(OF_PLATDATA))
|
|
|
memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count));
|
|
|
- state_reset_for_test(state_get_current());
|
|
|
+ arch_reset_for_test();
|
|
|
|
|
|
/* Determine whether to make the live tree available */
|
|
|
gd_set_of_root(of_live ? uts->of_root : NULL);
|