Re: [U-Boot] [PATCH 3/8] spl: Move the loading code into its own function

[Masahiro Yamada]

Hi Simon,


2016-11-18 2:29 GMT+09:00 Simon Glass :
> Create a boot_from_devices() function to handle trying each device. This
> helps to reduce the size of the already-large board_init_r() function.
>
> Signed-off-by: Simon Glass 
> ---
>
>  common/spl/spl.c | 33 +
>  1 file changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index 4f23c0e..8c3a47d 100644
> --- a/common/spl/spl.c
> +++ b/common/spl/spl.c
> @@ -372,12 +372,29 @@ static int spl_load_image(struct spl_image_info 
> *spl_image, u32 boot_device)
>
> bootdev.boot_device = boot_device;
> bootdev.boot_device_name = NULL;
> -   if (loader)
> -   return loader->load_image(spl_image, );
>
> +   return loader->load_image(spl_image, );
> +}
> +
> +static int boot_from_devices(struct spl_image_info *spl_image,
> +u32 spl_boot_list[])
> +{
> +   int i;
> +
> +   for (i = 0; i < ARRAY_SIZE(spl_boot_list) &&
> +spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
> +   struct spl_image_loader *loader;
> +
> +   announce_boot_device(spl_boot_list[i]);
> +   loader = spl_ll_find_loader(spl_boot_list[i]);


I do not believe ARRAY_SIZE(spl_boot_list) would work
in this context.




-- 
Best Regards
Masahiro Yamada
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH 3/8] spl: Move the loading code into its own function

[Simon Glass]

Create a boot_from_devices() function to handle trying each device. This
helps to reduce the size of the already-large board_init_r() function.

Signed-off-by: Simon Glass 
---

 common/spl/spl.c | 33 +
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 4f23c0e..8c3a47d 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -372,12 +372,29 @@ static int spl_load_image(struct spl_image_info 
*spl_image, u32 boot_device)
 
bootdev.boot_device = boot_device;
bootdev.boot_device_name = NULL;
-   if (loader)
-   return loader->load_image(spl_image, );
 
+   return loader->load_image(spl_image, );
+}
+
+static int boot_from_devices(struct spl_image_info *spl_image,
+u32 spl_boot_list[])
+{
+   int i;
+
+   for (i = 0; i < ARRAY_SIZE(spl_boot_list) &&
+spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
+   struct spl_image_loader *loader;
+
+   announce_boot_device(spl_boot_list[i]);
+   loader = spl_ll_find_loader(spl_boot_list[i]);
 #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
-   puts("SPL: Unsupported Boot Device!\n");
+   if (!loader)
+   puts("SPL: Unsupported Boot Device!\n");
 #endif
+   if (loader && !spl_load_image(spl_image, spl_boot_list[i]))
+   return 0;
+   }
+
return -ENODEV;
 }
 
@@ -391,7 +408,6 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
BOOT_DEVICE_NONE,
};
struct spl_image_info spl_image;
-   int i;
 
debug(">>spl:board_init_r()\n");
 
@@ -418,15 +434,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 
memset(_image, '\0', sizeof(spl_image));
board_boot_order(spl_boot_list);
-   for (i = 0; i < ARRAY_SIZE(spl_boot_list) &&
-   spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
-   announce_boot_device(spl_boot_list[i]);
-   if (!spl_load_image(_image, spl_boot_list[i]))
-   break;
-   }
 
-   if (i == ARRAY_SIZE(spl_boot_list) ||
-   spl_boot_list[i] == BOOT_DEVICE_NONE) {
+   if (boot_from_devices(_image, spl_boot_list)) {
puts("SPL: failed to boot from all boot devices\n");
hang();
}
-- 
2.8.0.rc3.226.g39d4020

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot