From: Gerald Van Baren <vanbaren@cideas.com>
Date: Thu, 26 Apr 2007 02:47:15 +0000 (-0400)
Subject: Improve fdt move length handling.
X-Git-Tag: v1.3.0-rc1~19^2~20^2~2^2~15
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6be07cc1ca458278c85ecdbf1a0536cff4c701ec;p=u-boot

Improve fdt move length handling.

Make the length parameter optional: if not specified, do the move using
the current size unchanged.

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

diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index 08fe3512d4..a119985942 100644
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -115,7 +115,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		int  len;
 		int  err;
 
-		if (argc != 5) {
+		if (argc < 4) {
 			printf ("Usage:\n%s\n", cmdtp->usage);
 			return 1;
 		}
@@ -129,11 +129,20 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		}
 
 		newaddr = (struct fdt_header *)simple_strtoul(argv[3], NULL, 16);
-		len     =  simple_strtoul(argv[4], NULL, 16);
-		if (len < fdt_totalsize(fdt)) {
-			printf ("New length %d < existing length %d, aborting.\n",
-				len, fdt_totalsize(fdt));
-			return 1;
+
+		/*
+		 * If the user specifies a length, use that.  Otherwise use the
+		 * current length.
+		 */
+		if (argc <= 4) {
+			len = fdt_totalsize(fdt);
+		} else {
+			len = simple_strtoul(argv[4], NULL, 16);
+			if (len < fdt_totalsize(fdt)) {
+				printf ("New length 0x%X < existing length 0x%X, aborting.\n",
+					len, fdt_totalsize(fdt));
+				return 1;
+			}
 		}
 
 		/*