From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karl Apsite Date: Fri, 15 May 2015 16:17:35 -0400 Subject: [U-Boot] [PATCH v1 2/3] Combine bootm_find_ functions together In-Reply-To: References: <1431521640-31083-1-git-send-email-Karl.Apsite@dornerworks.com> <1431521640-31083-3-git-send-email-Karl.Apsite@dornerworks.com> Message-ID: <5556545F.50201@dornerworks.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 05/15/2015 09:57 AM, Simon Glass wrote: > Hi Karl, > > On 13 May 2015 at 06:53, Karl Apsite wrote: >> 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, so removing >> the wrapper, and condensing these together hopefully makes the code a >> little simpler. >> >> Signed-off-by: Karl Apsite >> --- >> >> common/bootm.c | 37 ++----------------------------------- >> common/cmd_bootm.c | 4 ++-- >> include/bootm.h | 2 +- >> 3 files changed, 5 insertions(+), 38 deletions(-) >> >> diff --git a/common/bootm.c b/common/bootm.c >> index f04e49b..ae0d674 100644 >> --- a/common/bootm.c >> +++ b/common/bootm.c >> @@ -206,7 +206,7 @@ static int bootm_find_os(cmd_tbl_t *cmdtp, int flag, int argc, >> return 0; >> } >> >> -static int bootm_find_ramdisk(int flag, int argc, char * const argv[]) >> +int bootm_find_images(int flag, int argc, char * const argv[]) >> { >> int ret; >> >> @@ -218,14 +218,7 @@ static int bootm_find_ramdisk(int flag, int argc, char * const argv[]) >> return 1; >> } >> >> - return 0; >> -} >> - >> #if defined(CONFIG_OF_LIBFDT) >> -static int bootm_find_fdt(int flag, int argc, char * const argv[]) >> -{ >> - int ret; >> - >> /* find flattened device tree */ >> ret = boot_get_fdt(flag, argc, argv, IH_ARCH_DEFAULT, &images, >> &images.ft_addr, &images.ft_len); >> @@ -233,18 +226,10 @@ static int bootm_find_fdt(int flag, int argc, char * const argv[]) >> puts("Could not find a valid device tree\n"); >> return 1; >> } >> - >> set_working_fdt_addr((ulong)images.ft_addr); >> - >> - return 0; >> -} >> #endif >> >> #if defined(CONFIG_FIT) >> -static int bootm_find_loadables(int flag, int argc, char * const argv[]) >> -{ >> - int ret; >> - >> /* find all of the loadables */ >> ret = boot_get_loadable(argc, argv, &images, IH_ARCH_DEFAULT, >> NULL, NULL); >> @@ -252,24 +237,6 @@ static int bootm_find_loadables(int flag, int argc, char * const argv[]) >> puts("Loadable(s) is corrupt or invalid\n"); >> return 1; >> } >> - >> - return 0; >> -} >> -#endif >> - >> -int bootm_find_ramdisk_fdt(int flag, int argc, char * const argv[]) >> -{ >> - if (bootm_find_ramdisk(flag, argc, argv)) >> - return 1; >> - >> -#if defined(CONFIG_OF_LIBFDT) >> - if (bootm_find_fdt(flag, argc, argv)) >> - return 1; >> -#endif >> - >> -#if defined(CONFIG_FIT) >> - if (bootm_find_loadables(flag, argc, argv)) >> - return 1; >> #endif >> >> return 0; >> @@ -283,7 +250,7 @@ static int bootm_find_other(cmd_tbl_t *cmdtp, int flag, int argc, >> (images.os.type == IH_TYPE_MULTI)) && >> (images.os.os == IH_OS_LINUX || >> images.os.os == IH_OS_VXWORKS)) >> - return bootm_find_ramdisk_fdt(flag, argc, argv); >> + return bootm_find_images(flag, argc, argv); >> >> return 0; >> } >> diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c >> index 6b6aca6..48738ac 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; >> diff --git a/include/bootm.h b/include/bootm.h >> index 6181488..4981377 100644 >> --- a/include/bootm.h >> +++ b/include/bootm.h >> @@ -49,7 +49,7 @@ int boot_selected_os(int argc, char * const argv[], int state, >> ulong bootm_disable_interrupts(void); >> >> /* This is a special function used by booti/bootz */ > >> -int bootm_find_ramdisk_fdt(int flag, int argc, char * const argv[]); >> +int bootm_find_images(int flag, int argc, char * const argv[]); > > Can you please add a proper functoin comment for this function? > Parameters, what it does, return value etc... > Sure thing. >> >> int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], >> int states, bootm_headers_t *images, int boot_progress); >> -- >> 2.3.7 >> > > Regards, > Simon >