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>
diff --git a/cmd/booti.c b/cmd/booti.c
index a6c7db2..dc73c83 100644
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -95,7 +95,9 @@
* 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 dd6fe49..bcf232b 100644
--- a/cmd/bootz.c
+++ b/cmd/bootz.c
@@ -54,7 +54,9 @@
* 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;