diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-22 11:15:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-22 11:15:52 -0400 |
| commit | a15fa1ba67d7b3c8061b515e7713f733fa328018 (patch) | |
| tree | f7746e2e7a3410043e9ea3f3f7c0a97e2c5e6dbb /test/test-main.c | |
| parent | 806734f41b25931798fdf667b5a2ae830229c13f (diff) | |
| parent | 1b098b3e655451572054ce933a87231ee16f7133 (diff) | |
Merge tag 'dm-pull-21jul21' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
dtoc improvements to show better warnings
minor test build fixes
sandbox fixes for SDL2 and running TPL
bloblist resize feature
binman multithreading
Diffstat (limited to 'test/test-main.c')
| -rw-r--r-- | test/test-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test-main.c b/test/test-main.c index 7afe8741cf..3cdf6849c5 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -45,7 +45,7 @@ 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 (IS_ENABLED(CONFIG_UT_DM) && !CONFIG_IS_ENABLED(OF_PLATDATA)) + if (CONFIG_IS_ENABLED(UT_DM) && !CONFIG_IS_ENABLED(OF_PLATDATA)) memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count)); arch_reset_for_test(); |