[U-Boot-Users] [PATCH] Support legacy multi-type images without FDT section.

[U-Boot-Users] [PATCH] Support legacy multi-type images without FDT section.

[Nick Spence]

This patch enables legacy multi-type images containing only a Linux kernel
and root file system to be loaded, maintaining compatibility with previous
versions of u-boot.

This is required when using old image files such as a Linux 2.4 kernel /
filesystem.

Signed-off-by: Nick Spence <nick.spence@freescale.com>
---
 lib_ppc/bootm.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 0328bad..9194fd8 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -667,9 +667,8 @@ static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 				goto error;
 			}
 		} else {
-			fdt_error ("Did not find a Flattened Device Tree "
-				"in a legacy multi-component image");
-			goto error;
+			debug ("## No Flattened Device Tree\n");
+			return 0;
 		}
 	} else {
 		debug ("## No Flattened Device Tree\n");
-- 
1.5.2.2

[U-Boot-Users] [PATCH] Support legacy multi-type images without FDT section.

[Bartlomiej Sieka]

Nick Spence wrote:
> This patch enables legacy multi-type images containing only a Linux kernel
> and root file system to be loaded, maintaining compatibility with previous
> versions of u-boot.
> 
> This is required when using old image files such as a Linux 2.4 kernel /
> filesystem.
> 
> Signed-off-by: Nick Spence <nick.spence@freescale.com>
> ---
>  lib_ppc/bootm.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
> index 0328bad..9194fd8 100644
> --- a/lib_ppc/bootm.c
> +++ b/lib_ppc/bootm.c
> @@ -667,9 +667,8 @@ static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
>  				goto error;
>  			}
>  		} else {
> -			fdt_error ("Did not find a Flattened Device Tree "
> -				"in a legacy multi-component image");
> -			goto error;
> +			debug ("## No Flattened Device Tree\n");
> +			return 0;
>  		}
>  	} else {
>  		debug ("## No Flattened Device Tree\n");

Hi Nick,

Good catch -- thanks.

Acked-by: Bartlomiej Sieka <tur@semihalf.com>

Regards,
Bartlomiej

[U-Boot-Users] [PATCH] Support legacy multi-type images without FDT section.

[Wolfgang Denk]

In message <1210311142704-git-send-email-nick.spence@freescale.com> you wrote:
> This patch enables legacy multi-type images containing only a Linux kernel
> and root file system to be loaded, maintaining compatibility with previous
> versions of u-boot.
> 
> This is required when using old image files such as a Linux 2.4 kernel /
> filesystem.
> 
> Signed-off-by: Nick Spence <nick.spence@freescale.com>
> ---
>  lib_ppc/bootm.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Cigarette, n.: A fire at one end, a fool at the other, and a  bit  of
tobacco in between.