From: Gerald Van Baren <vanbaren@cideas.com>
Date: Wed, 9 May 2007 01:27:35 +0000 (-0400)
Subject: Fix bugs in the CONFIG_OF_LIBFDT
X-Git-Tag: v1.3.0-rc1~19^2~20^2~2^2~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=89c8757d8f213c47709bdc4efe0695263a6080a6;p=u-boot

Fix bugs in the CONFIG_OF_LIBFDT

Stupid coding mistakes (identified by Timur Tabi, thanks).

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

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 2436581b18..1cb0e43585 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -788,7 +788,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 				return;
 			}
 #if defined(CONFIG_OF_LIBFDT)
-			if (fdt_check_header(of_flat_tree + sizeof(image_header_t)) == 0) {
+			if (fdt_check_header(of_flat_tree + sizeof(image_header_t)) != 0) {
 #else
 			if (*((ulong *)(of_flat_tree + sizeof(image_header_t))) != OF_DT_HEADER) {
 #endif
@@ -944,7 +944,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
 		of_flat_tree = (char *)of_start;
 		printf ("   Loading Device Tree to %08lx, end %08lx ... ",
 			of_start, of_start + of_len - 1);
-		err = fdt_open_into((void *)of_start, (void *)of_data, of_len);
+		err = fdt_open_into((void *)of_data, (void *)of_start, of_len);
 		if (err != 0) {
 			printf ("libfdt: %s " __FILE__ " %d\n", fdt_strerror(err), __LINE__);
 		}