From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bartlomiej Sieka <tur@semihalf.com>
Date: Fri, 09 May 2008 12:22:52 +0200
Subject: [U-Boot-Users] [PATCH] Support legacy multi-type images without
 FDT	section.
In-Reply-To: <1210311142704-git-send-email-nick.spence@freescale.com>
References: <1210311142704-git-send-email-nick.spence@freescale.com>
Message-ID: <482425FC.9020107@semihalf.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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