eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dm: Avoid using #ifdef for CONFIG_OF_LIVE

Browse Source 
At present this option results in a number of #ifdefs due to the presence
or absence of the global_data of_root member.

Add a few macros to global_data.h to work around this. Update the code
accordingly.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2020-10-03 09:25:22 -06:00
parent 08c3b88dd1
commit a652d9c73a
6 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/dm/test-main.c
View File

@@ -33,10 +33,8 @@ static int dm_test_init(struct unit_test_state *uts, bool of_live)
memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count));
state_reset_for_test(state_get_current());
#ifdef CONFIG_OF_LIVE
/* Determine whether to make the live tree available */
gd->of_root = of_live ? uts->of_root : NULL;
#endif
gd_set_of_root(of_live ? uts->of_root : NULL);
ut_assertok(dm_init(of_live));
dms->root = dm_root();
@@ -152,9 +150,7 @@ static int dm_test_main(const char *test_name)
printf("Running %d driver model tests\n", n_ents);
found = 0;
#ifdef CONFIG_OF_LIVE
uts->of_root = gd->of_root;
#endif
uts->of_root = gd_of_root();
for (test = tests; test < tests + n_ents; test++) {
const char *name = test->name;
int runs;
@@ -167,7 +163,7 @@ static int dm_test_main(const char *test_name)
/* Run with the live tree if possible */
runs = 0;
if (IS_ENABLED(CONFIG_OF_LIVE)) {
if (CONFIG_IS_ENABLED(OF_LIVE)) {
if (!(test->flags & UT_TESTF_FLAT_TREE)) {
ut_assertok(dm_do_test(uts, test, true));
runs++;
@@ -192,11 +188,9 @@ static int dm_test_main(const char *test_name)
printf("Failures: %d\n", uts->fail_count);
/* Put everything back to normal so that sandbox works as expected */
#ifdef CONFIG_OF_LIVE
gd->of_root = uts->of_root;
#endif
gd_set_of_root(uts->of_root);
gd->dm_root = NULL;
ut_assertok(dm_init(IS_ENABLED(CONFIG_OF_LIVE)));
ut_assertok(dm_init(CONFIG_IS_ENABLED(OF_LIVE)));
dm_scan_platdata(false);
dm_scan_fdt(gd->fdt_blob, false);