summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-17 11:34:08 -0700
committerTom Rini <trini@ti.com>2012-09-17 11:34:08 -0700
commitcd40a66c197fd43f761fa398cf785ff1a86250de (patch)
tree7971ec1595b835b5c69d9a4917a2adc971099d9a
parent8f082d78fafd94db3f21b503794e0875d3331e53 (diff)
parente02c9458748a59e5d80649deb5e40f96ed992bb5 (diff)
downloadu-boot-imx-cd40a66c197fd43f761fa398cf785ff1a86250de.zip
u-boot-imx-cd40a66c197fd43f761fa398cf785ff1a86250de.tar.gz
u-boot-imx-cd40a66c197fd43f761fa398cf785ff1a86250de.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-fdt
-rw-r--r--common/cmd_fdt.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 9a5c53e..e2225c4 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;