diff options
| author | Sean Anderson <seanga2@gmail.com> | 2023-10-14 16:47:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-17 20:50:52 -0400 |
| commit | eaf738559cf2fd9cf206fd77fe28d3695c698261 (patch) | |
| tree | 06248076a8d658a45234c20c1a273f372be47a0e /test | |
| parent | 12b3339070bcab746355647a6aae7498f28c4add (diff) | |
| download | u-boot-eaf738559cf2fd9cf206fd77fe28d3695c698261.tar.gz u-boot-eaf738559cf2fd9cf206fd77fe28d3695c698261.tar.bz2 u-boot-eaf738559cf2fd9cf206fd77fe28d3695c698261.zip | |
spl: Allow enabling SPL_OF_REAL and SPL_OF_PLATDATA at the same time
Sandbox unit tests in U-Boot proper load a test device tree to have some
devices to work with. In order to do the same in SPL, we must enable
SPL_OF_REAL. However, we already have SPL_OF_PLATDATA enabled. When
generating platdata from a devicetree, it is expected that we will not need
devicetree access functions (even though SPL_OF_CONTROL is enabled). This
expectation does not hold for sandbox, so allow user control of
SPL_OF_REAL.
There are several places in the tree where conditions involving OF_PLATDATA
or OF_REAL no longer function correctly when both of these options can be
selected at the same time. Adjust these conditions accordingly.
Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'test')
| -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 edb20bc4b9..b7015d9f38 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -303,7 +303,7 @@ static int test_pre_run(struct unit_test_state *uts, struct unit_test *test) if (test->flags & UT_TESTF_PROBE_TEST) ut_assertok(do_autoprobe(uts)); - if (!CONFIG_IS_ENABLED(OF_PLATDATA) && + if (CONFIG_IS_ENABLED(OF_REAL) && (test->flags & UT_TESTF_SCAN_FDT)) { /* * only set this if we know the ethernet uclass will be created |