compiler.h: unify system ifdef cruft here

[karo-tx-uboot.git] / common / cmd_fdt.c

diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c
index d3b19ddc1f4a8d278868af55ddb5b20f6e1d9eb5..86837723b55dab1be00f6aa8305f78bef882fa71 100644 (file)
--- a/common/cmd_fdt.c
+++ b/common/cmd_fdt.c
@@ -50,13 +50,23 @@ static int fdt_print(const char *pathp, char *prop, int depth);
  */
 struct fdt_header *working_fdt;
 
+void set_working_fdt_addr(void *addr)
+{
+       char buf[17];
+
+       working_fdt = addr;
+
+       sprintf(buf, "%lx", (unsigned long)addr);
+       setenv("fdtaddr", buf);
+}
+
 /*
  * Flattened Device Tree command, see the help for parameter definitions.
  */
 int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -64,10 +74,20 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
         * Set the address of the fdt
         ********************************************************************/
        if (argv[1][0] == 'a') {
+               unsigned long addr;
                /*
                 * Set the address [and length] of the fdt.
                 */
-               working_fdt = (struct fdt_header *)simple_strtoul(argv[2], NULL, 16);
+               if (argc == 2) {
+                       if (!fdt_valid()) {
+                               return 1;
+                       }
+                       printf("The address of the fdt is %p\n", working_fdt);
+                       return 0;
+               }
+
+               addr = simple_strtoul(argv[2], NULL, 16);
+               set_working_fdt_addr((void *)addr);
 
                if (!fdt_valid()) {
                        return 1;
@@ -105,7 +125,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                int  err;
 
                if (argc < 4) {
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        return 1;
                }
 
@@ -159,7 +179,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                 * Parameters: Node path, new node to be appended to the path.
                 */
                if (argc < 4) {
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        return 1;
                }
 
@@ -197,7 +217,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                 * Parameters: Node path, property, optional value.
                 */
                if (argc < 4) {
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        return 1;
                }
 
@@ -344,7 +364,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        } else if (strncmp(argv[1], "me", 2) == 0) {
                uint64_t addr, size;
                int err;
-#ifdef CFG_64BIT_STRTOUL
+#ifdef CONFIG_SYS_64BIT_STRTOUL
                        addr = simple_strtoull(argv[2], NULL, 16);
                        size = simple_strtoull(argv[3], NULL, 16);
 #else
@@ -382,7 +402,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                } else if (argv[2][0] == 'a') {
                        uint64_t addr, size;
                        int err;
-#ifdef CFG_64BIT_STRTOUL
+#ifdef CONFIG_SYS_64BIT_STRTOUL
                        addr = simple_strtoull(argv[3], NULL, 16);
                        size = simple_strtoull(argv[4], NULL, 16);
 #else
@@ -407,7 +427,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                        }
                } else {
                        /* Unrecognized command */
-                       printf ("Usage:\n%s\n", cmdtp->usage);
+                       cmd_usage(cmdtp);
                        return 1;
                }
        }
@@ -417,11 +437,29 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                ft_board_setup(working_fdt, gd->bd);
 #endif
        /* Create a chosen node */
-       else if (argv[1][0] == 'c')
-               fdt_chosen(working_fdt, 0, 0, 1);
+       else if (argv[1][0] == 'c') {
+               unsigned long initrd_start = 0, initrd_end = 0;
+
+               if ((argc != 2) && (argc != 4)) {
+                       cmd_usage(cmdtp);
+                       return 1;
+               }
+
+               if (argc == 4) {
+                       initrd_start = simple_strtoul(argv[2], NULL, 16);
+                       initrd_end = simple_strtoul(argv[3], NULL, 16);
+               }
+
+               fdt_chosen(working_fdt, 1);
+               fdt_initrd(working_fdt, initrd_start, initrd_end, 1);
+       }
+       /* resize the fdt */
+       else if (strncmp(argv[1], "re", 2) == 0) {
+               fdt_resize(working_fdt);
+       }
        else {
                /* Unrecognized command */
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -781,12 +819,13 @@ static int fdt_print(const char *pathp, char *prop, int depth)
 
 U_BOOT_CMD(
        fdt,    255,    0,      do_fdt,
-       "fdt     - flattened device tree utility commands\n",
+       "flattened device tree utility commands",
            "addr   <addr> [<length>]        - Set the fdt location to <addr>\n"
 #ifdef CONFIG_OF_BOARD_SETUP
        "fdt boardsetup                      - Do board-specific set up\n"
 #endif
        "fdt move   <fdt> <newaddr> <length> - Copy the fdt to <addr> and make it active\n"
+       "fdt resize                          - Resize fdt to size + padding to 4k addr\n"
        "fdt print  <path> [<prop>]          - Recursive print starting at <path>\n"
        "fdt list   <path> [<prop>]          - Print one level starting at <path>\n"
        "fdt set    <path> <prop> [<val>]    - Set <property> [to <val>]\n"
@@ -798,7 +837,8 @@ U_BOOT_CMD(
        "fdt rsvmem print                    - Show current mem reserves\n"
        "fdt rsvmem add <addr> <size>        - Add a mem reserve\n"
        "fdt rsvmem delete <index>           - Delete a mem reserves\n"
-       "fdt chosen - Add/update the /chosen branch in the tree\n"
-       "NOTE: If the path or property you are setting/printing has a '#' character\n"
-       "     or spaces, you MUST escape it with a \\ character or quote it with \".\n"
+       "fdt chosen [<start> <end>]          - Add/update the /chosen branch in the tree\n"
+       "                                        <start>/<end> - initrd start/end addr\n"
+       "NOTE: Dereference aliases by omiting the leading '/', "
+               "e.g. fdt print ethernet0."
 );