Skip to contentSkip to conversation

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

PATCH New Stefan Roese 2 participants 2 messages Sep 26, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 lib_ppc/bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib_ppc/bootm.c +1 -1
index 38266e1..5af25dd 100644
@@ -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");
Signature · 1 line
1.6.0.2
#1 lore raw

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

Quoted 14 lines · Stefan Roese

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

---
 lib_ppc/bootm.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib_ppc/bootm.c +0 -0
index 38266e1..5af25dd 100644

lib_ppc/bootm.c int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) · line 151

Quoted 8 lines
lib_ppc/bootm.c +1 -1
@@ -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");

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

gvb