diff options
| author | Tom Rini <trini@ti.com> | 2012-09-17 11:34:08 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-17 11:34:08 -0700 |
| commit | cd40a66c197fd43f761fa398cf785ff1a86250de (patch) | |
| tree | 7971ec1595b835b5c69d9a4917a2adc971099d9a /common | |
| parent | 8f082d78fafd94db3f21b503794e0875d3331e53 (diff) | |
| parent | e02c9458748a59e5d80649deb5e40f96ed992bb5 (diff) | |
| download | blackbird-obmc-uboot-cd40a66c197fd43f761fa398cf785ff1a86250de.tar.gz blackbird-obmc-uboot-cd40a66c197fd43f761fa398cf785ff1a86250de.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_fdt.c | 13 |
1 files changed, 12 insertions, 1 deletions
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; |
