From: Simon Glass <sjg@chromium.org>
Date: Mon, 28 Feb 2022 22:13:49 +0000 (-0700)
Subject: sandbox: test: Tidy up spl_test_load() calls
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=79e1d289b71aec48ce765513eaeb5c12992fa348;p=u-boot.git

sandbox: test: Tidy up spl_test_load() calls

Use the new sandbox_find_next_phase() function, which does what is needed
here.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/test/image/spl_load.c b/test/image/spl_load.c
index e7cabf5680..df389e26f9 100644
--- a/test/image/spl_load.c
+++ b/test/image/spl_load.c
@@ -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;