aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorSimon Glass2023-11-18 14:05:16 -0700
committerTom Rini2023-12-13 11:51:24 -0500
commit3ac85bdc6a6cc5bc8a93ad91b330015ad8355cb2 (patch)
tree94ba6d2923df10971f27a98dd2ff9296e6b1ecb3 /cmd
parentb020254d71ed0873baddb9b9bc6ec5bf1e82b26c (diff)
bootm: Adjust the parameters of bootm_find_images()
Rather than passing it all the command-line args, pass in the pieces that it needs. These are the image address, the ramdisk address/name and the FDT address/name. Ultimately this will allow usage of this function without being called from the command line. Move the function comment to the header file and tidy it a little. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/booti.c4
-rw-r--r--cmd/bootz.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/cmd/booti.c b/cmd/booti.c
index a6c7db272c5..dc73c83f0db 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -95,7 +95,9 @@ static int booti_start(struct cmd_tbl *cmdtp, int flag, int argc,
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
* have a header that provide this informaiton.
*/
- if (bootm_find_images(flag, argc, argv, relocated_addr, image_size))
+ if (bootm_find_images(image_load_addr, argc > 1 ? argv[1] : NULL,
+ argc > 2 ? argv[2] : NULL, relocated_addr,
+ image_size))
return 1;
return 0;
diff --git a/cmd/bootz.c b/cmd/bootz.c
index dd6fe4904b0..bcf232b4f30 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -54,7 +54,9 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc,
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
* have a header that provide this informaiton.
*/
- if (bootm_find_images(flag, argc, argv, images->ep, zi_end - zi_start))
+ if (bootm_find_images(image_load_addr, argc > 1 ? argv[1] : NULL,
+ argc > 2 ? argv[2] : NULL, images->ep,
+ zi_end - zi_start))
return 1;
return 0;