public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] fdt: Overwrite /chosen node in bootm if it already exists in the dtb
@ 2008-09-26 15:03 Stefan Roese
  2008-09-26 15:06 ` Jerry Van Baren
  0 siblings, 1 reply; 2+ messages in thread
From: Stefan Roese @ 2008-09-26 15:03 UTC (permalink / raw)
  To: u-boot

Set force parameter in fdt_chosen() call in do_bootm_linux() call.
Without this, the chosen node is not overwritten if it already
exists.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 lib_ppc/bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 38266e1..5af25dd 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -145,7 +145,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 	 * if the user wants it (the logic is in the subroutines).
 	 */
 	if (of_size) {
-		if (fdt_chosen(of_flat_tree, 0) < 0) {
+		if (fdt_chosen(of_flat_tree, 1) < 0) {
 			puts ("ERROR: ");
 			puts ("/chosen node create failed");
 			puts (" - must RESET the board to recover.\n");
-- 
1.6.0.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] fdt: Overwrite /chosen node in bootm if it already exists in the dtb
  2008-09-26 15:03 [U-Boot] [PATCH] fdt: Overwrite /chosen node in bootm if it already exists in the dtb Stefan Roese
@ 2008-09-26 15:06 ` Jerry Van Baren
  0 siblings, 0 replies; 2+ messages in thread
From: Jerry Van Baren @ 2008-09-26 15:06 UTC (permalink / raw)
  To: u-boot

Stefan Roese wrote:
> Set force parameter in fdt_chosen() call in do_bootm_linux() call.
> Without this, the chosen node is not overwritten if it already
> exists.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  lib_ppc/bootm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
> index 38266e1..5af25dd 100644
> --- a/lib_ppc/bootm.c
> +++ b/lib_ppc/bootm.c
> @@ -145,7 +145,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
>  	 * if the user wants it (the logic is in the subroutines).
>  	 */
>  	if (of_size) {
> -		if (fdt_chosen(of_flat_tree, 0) < 0) {
> +		if (fdt_chosen(of_flat_tree, 1) < 0) {
>  			puts ("ERROR: ");
>  			puts ("/chosen node create failed");
>  			puts (" - must RESET the board to recover.\n");

Acked-by: Gerald Van Baren <vanbaren@cideas.com>

Please apply, Wolfgang, and fix the error in my recollection.  :-)

gvb

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-09-26 15:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-26 15:03 [U-Boot] [PATCH] fdt: Overwrite /chosen node in bootm if it already exists in the dtb Stefan Roese
2008-09-26 15:06 ` Jerry Van Baren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox