sandbox: test: Tidy up spl_test_load() calls
authorSimon Glass <sjg@chromium.org>
Mon, 28 Feb 2022 22:13:49 +0000 (15:13 -0700)
committerSimon Glass <sjg@chromium.org>
Sat, 19 Mar 2022 01:24:24 +0000 (19:24 -0600)
Use the new sandbox_find_next_phase() function, which does what is needed
here.

Signed-off-by: Simon Glass <sjg@chromium.org>
test/image/spl_load.c

index e7cabf5..df389e2 100644 (file)
@@ -56,7 +56,6 @@ struct image_header *spl_get_load_buffer(ssize_t offset, size_t size)
 
 static int spl_test_load(struct unit_test_state *uts)
 {
-       const char *cur_prefix, *next_prefix;
        struct spl_image_info image;
        struct image_header *header;
        struct text_ctx text_ctx;
@@ -69,10 +68,7 @@ static int spl_test_load(struct unit_test_state *uts)
        load.bl_len = 512;
        load.read = read_fit_image;
 
-       cur_prefix = spl_phase_prefix(spl_phase());
-       next_prefix = spl_phase_prefix(spl_next_phase());
-       ret = os_find_u_boot(fname, sizeof(fname), true, cur_prefix,
-                            next_prefix);
+       ret = sandbox_find_next_phase(fname, sizeof(fname), true);
        if (ret) {
                printf("(%s not found, error %d)\n", fname, ret);
                return ret;