From: Tom Rini <trini@ti.com>
Date: Mon, 17 Sep 2012 18:34:08 +0000 (-0700)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-fdt
X-Git-Tag: v2012.10-rc1~40
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd40a66c197fd43f761fa398cf785ff1a86250de;hp=8f082d78fafd94db3f21b503794e0875d3331e53;p=u-boot

Merge branch 'master' of git://git.denx.de/u-boot-fdt
---

diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 9a5c53ec06..e2225c4d5c 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -114,10 +114,21 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 			}
 		}
 
+		return CMD_RET_SUCCESS;
+	}
+
+	if (!working_fdt) {
+		puts(
+			"No FDT memory address configured. Please configure\n"
+			"the FDT address via \"fdt addr <address>\" command.\n"
+			"Aborting!\n");
+		return CMD_RET_FAILURE;
+	}
+
 	/*
 	 * Move the working_fdt
 	 */
-	} else if (strncmp(argv[1], "mo", 2) == 0) {
+	if (strncmp(argv[1], "mo", 2) == 0) {
 		struct fdt_header *newaddr;
 		int  len;
 		int  err;