[U-Boot,v2] spl_mmc: allow to load raw image

The function spl_parse_image_header() falls back to a raw image
if the U-Boot header is missing and CONFIG_SPL_PANIC_ON_RAW_IMAGE
is undefined.  While, mmc_load_image_raw_sector() only accepts a
U-Boot legacy image or an FIT image, preventing us from loading a
raw image.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - rebase on commit 41bccb814285 and rephrase git-log according to it

 common/spl/spl_mmc.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

On Wed, Mar 16, 2016 at 12:10:00PM +0900, Masahiro Yamada wrote:

> The function spl_parse_image_header() falls back to a raw image
> if the U-Boot header is missing and CONFIG_SPL_PANIC_ON_RAW_IMAGE
> is undefined.  While, mmc_load_image_raw_sector() only accepts a
> U-Boot legacy image or an FIT image, preventing us from loading a
> raw image.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

2016-03-16 12:10 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> The function spl_parse_image_header() falls back to a raw image
> if the U-Boot header is missing and CONFIG_SPL_PANIC_ON_RAW_IMAGE
> is undefined.  While, mmc_load_image_raw_sector() only accepts a
> U-Boot legacy image or an FIT image, preventing us from loading a
> raw image.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>


Applied to u-boot-uniphier/master.

On Tue, Mar 15, 2016 at 10:10 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> The function spl_parse_image_header() falls back to a raw image
> if the U-Boot header is missing and CONFIG_SPL_PANIC_ON_RAW_IMAGE
> is undefined.  While, mmc_load_image_raw_sector() only accepts a
> U-Boot legacy image or an FIT image, preventing us from loading a
> raw image.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

I know it's been pushed to the trunk already, but I think we have an
issue with at least one OMAP3 board.


>
> Changes in v2:
>   - rebase on commit 41bccb814285 and rephrase git-log according to it
>
>  common/spl/spl_mmc.c | 18 ++++--------------
>  1 file changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
> index c0e76be..7d3bfc6 100644
> --- a/common/spl/spl_mmc.c
> +++ b/common/spl/spl_mmc.c
> @@ -41,7 +41,6 @@ static int mmc_load_legacy(struct mmc *mmc, ulong sector,
>         return 0;
>  }
>
> -#ifdef CONFIG_SPL_LOAD_FIT
>  static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
>                              ulong count, void *buf)
>  {
> @@ -49,7 +48,6 @@ static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
>
>         return mmc->block_dev.block_read(&mmc->block_dev, sector, count, buf);
>  }
> -#endif
>
>  static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
>  {
> @@ -68,12 +66,8 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
>                 goto end;
>         }
>
> -       switch (image_get_magic(header)) {
> -       case IH_MAGIC:
> -               ret = mmc_load_legacy(mmc, sector, header);
> -               break;
> -#ifdef CONFIG_SPL_LOAD_FIT
> -       case FDT_MAGIC: {
> +       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
> +           image_get_magic(header) == FDT_MAGIC) {
>                 struct spl_load_info load;
>
>                 debug("Found FIT\n");
> @@ -82,12 +76,8 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
>                 load.bl_len = mmc->read_bl_len;
>                 load.read = h_spl_load_read;
>                 ret = spl_load_simple_fit(&load, sector, header);
> -               break;
> -       }
> -#endif
> -       default:
> -               puts("bad magic\n");
> -               return -1;
> +       } else {

The following line makes my omap3 board hang.

> +               ret = mmc_load_legacy(mmc, sector, header);

However if we use "return -1" the board loads u-boot.img properly on
the omap3logic board.


>         }
>
>  end:
> --
> 1.9.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot