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 <[email protected]>

---
 common/cmd_fdt.c |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

common/cmd_fdt.c +15 -7

index 08fe351..a119985 100644
@@ -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;
+                       }
                }
 
                /*
--

1.4.4.4

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users