From: Stefan Roese <sr@denx.de>
Date: Fri, 26 Sep 2008 15:03:26 +0000 (+0200)
Subject: fdt: Overwrite /chosen node in bootm if it already exists in the dtb
X-Git-Tag: v2008.10-rc3~24^2~1^2^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3e38577208e4256956bc33bb8bcd0a6b6fab55c3;p=u-boot

fdt: Overwrite /chosen node in bootm if it already exists in the dtb

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>
---

diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 38266e1da2..5af25dd222 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");