diff options
| author | Karl Apsite <Karl.Apsite@dornerworks.com> | 2015-05-21 09:52:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-28 08:18:21 -0400 |
| commit | d52e8575d9a4244992cd69e717affc97ea6e9b36 (patch) | |
| tree | 5059a114ba921fe78a60001a88116bdd9ad666d8 /common/cmd_bootm.c | |
| parent | 84a07dbfd8e916788d685a4227f9a4e770375ffd (diff) | |
| download | talos-obmc-uboot-d52e8575d9a4244992cd69e717affc97ea6e9b36.tar.gz talos-obmc-uboot-d52e8575d9a4244992cd69e717affc97ea6e9b36.zip | |
Combine bootm_find_<thing> functions together
bootm_find_ramdisk_fdt() renamed to bootm_find_images() for readability.
The function bootm_find_ramdisk_fdt() appears to be a simple wrapper for
bootm_find_ramdisk(), bootm_find_fdt(), and now bootm_find_loadables().
I didn't see any other callers entering a bootm_find<thing>, so removing
the wrapper, and condensing these together hopefully makes the code a
little simpler.
Signed-off-by: Karl Apsite <Karl.Apsite@dornerworks.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 6b6aca66fd..48738ac605 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -580,7 +580,7 @@ static int bootz_start(cmd_tbl_t *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_ramdisk_fdt(flag, argc, argv)) + if (bootm_find_images(flag, argc, argv)) return 1; return 0; @@ -721,7 +721,7 @@ static int booti_start(cmd_tbl_t *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_ramdisk_fdt(flag, argc, argv)) + if (bootm_find_images(flag, argc, argv)) return 1; return 0; |
