Skip to contentSkip to conversation

bootm: active fdt support only on ppc, m68k and sparc as done in image.c

PATCH New Jean-Christophe PLAGNIOL-VILLARD 2 participants 5 messages Sep 9, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bootm: active fdt support only on ppc, m68k and sparc as done in image.c

---
 common/cmd_bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
common/cmd_bootm.c +2 -0
index 861712b..2b4df80 100644
@@ -251,6 +251,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		}
 
 #if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC)
 		/* find flattened device tree */
 		ret = boot_get_fdt (flag, argc, argv, &images,
 				    &images.ft_addr, &images.ft_len);
@@ -261,6 +262,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 		set_working_fdt_addr(images.ft_addr);
 #endif
+#endif
 	}
 
 	images.os.start = (ulong)os_hdr;
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 2/2 bootm_load_os: fix load_end debug message

print load_end value not pointer

---
 common/cmd_bootm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
common/cmd_bootm.c +2 -2
index 2b4df80..9c63e04 100644
@@ -339,13 +339,13 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 		return BOOTM_ERR_UNIMPLEMENTED;
 	}
 	puts ("OK\n");
-	debug ("   kernel loaded at 0x%08lx, end = 0x%8p\n", load, load_end);
+	debug ("   kernel loaded at 0x%08lx, end = 0x%08lx\n", load, *load_end);
 	if (boot_progress)
 		show_boot_progress (7);
 
 	if ((load < blob_end) && (*load_end > blob_start)) {
 		debug ("images.os.start = 0x%lX, images.os.end = 0x%lx\n", blob_start, blob_end);
-		debug ("images.os.load = 0x%lx, load_end = 0x%p\n", load, load_end);
+		debug ("images.os.load = 0x%lx, load_end = 0x%lx\n", load, *load_end);
 
 		return BOOTM_ERR_OVERLAP;
 	}
Signature · 1 line
1.5.6.5
#2 lore raw

PATCH 2/2 bootm_load_os: fix load_end debug message

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 6 lines · In message <[email protected]> you wrote:

print load_end value not pointer

---
 common/cmd_bootm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.

Good catch!

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
"I say we take off; nuke the site from orbit. It's the only way to be
sure."                                  - Corporal Hicks, in "Aliens"
#3 lore raw

PATCH 1/2 bootm: active fdt support only on ppc, m68k and sparc as done in image.c

In reply to Jean-Christophe PLAGNIOL-VILLARD

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 18 lines · In message <[email protected]> you wrote:
---
 common/cmd_bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
common/cmd_bootm.c +1 -0
index 861712b..2b4df80 100644
@@ -251,6 +251,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 		}
 
 #if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC)
 		/* find flattened device tree */
 		ret = boot_get_fdt (flag, argc, argv, &images,
 				    &images.ft_addr, &images.ft_len);

common/cmd_bootm.c static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) · line 265

Quoted 4 lines
common/cmd_bootm.c +1 -0
@@ -261,6 +262,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 		set_working_fdt_addr(images.ft_addr);
 #endif
+#endif

I think this is not correct. There are even PPC board where FDT support is not enabled because CONFIG_OF_LIBFDT is not set. Your patch would change that - what's wrong with enabling CONFIG_OF_LIBFDT for the boards where you want to use it?

Best regards,

Wolfgang Denk

Signature · 7 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
G's Third Law:             In spite of all evidence  to  the  contra-
ry,  the  entire  universe  is composed of only two basic substances:
magic and bullshit.
H's Dictum:                There is no magic ...
#4 lore raw

PATCH 1/2 bootm: active fdt support only on ppc, m68k and sparc as done in image.c

In reply to Jean-Christophe PLAGNIOL-VILLARD

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 4 lines · In message <[email protected]> you wrote:
---
 common/cmd_bootm.c |    2 ++
 1 files changed, 2 insertions(+), 0 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
"The one charm of marriage is that it makes a  life  of  deception  a
neccessity."                                            - Oscar Wilde