Skip to contentSkip to conversation

Support legacy multi-type images without FDT section.

PATCH New Nick Spence 3 participants 3 messages May 9, 2008

lore
Share & tools
lore

Nick Spence

author
#0 lore raw

PATCH 1/1 Support legacy multi-type images without FDT section.

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 <[email protected]>
---
 lib_ppc/bootm.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
lib_ppc/bootm.c +2 -3
index 0328bad..9194fd8 100644
@@ -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");
Signature · 1 line
1.5.2.2
#1 lore raw

PATCH 1/1 Support legacy multi-type images without FDT section.

Quoted 18 lines · 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 <[email protected]>
---
 lib_ppc/bootm.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
lib_ppc/bootm.c +0 -0
index 0328bad..9194fd8 100644
@@ -667,9 +667,8 @@ static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],
 				goto error;

lib_ppc/bootm.c static int boot_get_fdt (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], · line 674

Quoted 10 lines
lib_ppc/bootm.c +2 -3
 			}
 		} 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 <[email protected]>

Regards,
Bartlomiej

Applied
#2 lore raw

PATCH 1/1 Support legacy multi-type images without FDT section.

In reply to Nick Spence
Quoted 11 lines · In message <[email protected]> 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 <[email protected]>
---
 lib_ppc/bootm.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
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.