diff options
| author | Simon Glass <sjg@chromium.org> | 2023-02-22 09:34:12 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-02 17:45:58 -0500 |
| commit | d5774594974307b5eae0b49928920046db02a5cc (patch) | |
| tree | ee3055dce18cec44e42d3f61da87bbde4c7df69c | |
| parent | 3b510807f59d6602df5b3de3ac5c2f8f6e1bd265 (diff) | |
test: Tidy up sandbox handling in test-main
This is pretty messy at present since it relies on a SPL_SANDBOX option
that does not exist. Use the normal options instead, so that it will work
with split config.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | test/test-main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/test-main.c b/test/test-main.c index ea959f4e859..b3c30d92937 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -46,14 +46,14 @@ enum fdtchk_t { */ static enum fdtchk_t fdt_action(void) { - /* Do a copy for sandbox (but only the U-Boot build, not SPL) */ - if (CONFIG_IS_ENABLED(SANDBOX)) - return FDTCHK_COPY; - /* For sandbox SPL builds, do nothing */ - if (IS_ENABLED(CONFIG_SANDBOX)) + if (IS_ENABLED(CONFIG_SANDBOX) && IS_ENABLED(CONFIG_SPL_BUILD)) return FDTCHK_NONE; + /* Do a copy for sandbox (but only the U-Boot build, not SPL) */ + if (IS_ENABLED(CONFIG_SANDBOX)) + return FDTCHK_COPY; + /* For all other boards, do a checksum */ return FDTCHK_CHECKSUM; } |