Remove CONFIG_SYS_BOOTCOUNT_SINGLEWORD

[people/ms/u-boot.git] / cmd / fdt.c

diff --git a/cmd/fdt.c b/cmd/fdt.c
index a21415dab4c05979fea84aff33c33dcb23e55106..b783b0df427c848ffd04f07662e27147fa6e2e22 100644 (file)
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -43,21 +43,21 @@ void set_working_fdt_addr(ulong addr)
 
        buf = map_sysmem(addr, 0);
        working_fdt = buf;
-       setenv_hex("fdtaddr", addr);
+       env_set_hex("fdtaddr", addr);
 }
 
 /*
  * Get a value from the fdt and format it to be set in the environment
  */
-static int fdt_value_setenv(const void *nodep, int len, const char *var)
+static int fdt_value_env_set(const void *nodep, int len, const char *var)
 {
        if (is_printable_string(nodep, len))
-               setenv(var, (void *)nodep);
+               env_set(var, (void *)nodep);
        else if (len == 4) {
                char buf[11];
 
                sprintf(buf, "0x%08X", fdt32_to_cpu(*(fdt32_t *)nodep));
-               setenv(var, buf);
+               env_set(var, buf);
        } else if (len%4 == 0 && len <= 20) {
                /* Needed to print things like sha1 hashes. */
                char buf[41];
@@ -66,7 +66,7 @@ static int fdt_value_setenv(const void *nodep, int len, const char *var)
                for (i = 0; i < len; i += sizeof(unsigned int))
                        sprintf(buf + (i * 2), "%08x",
                                *(unsigned int *)(nodep + i));
-               setenv(var, buf);
+               env_set(var, buf);
        } else {
                printf("error: unprintable value\n");
                return 1;
@@ -111,7 +111,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                return 1;
                        printf("The address of the fdt is %#08lx\n",
                               control ? (ulong)map_to_sysmem(blob) :
-                                       getenv_hex("fdtaddr", 0));
+                                       env_get_hex("fdtaddr", 0));
                        return 0;
                }
 
@@ -256,7 +256,8 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                char *pathp;            /* path */
                char *prop;             /* property */
                int  nodeoffset;        /* node offset from libfdt */
-               static char data[SCRATCHPAD];   /* storage for the property */
+               static char data[SCRATCHPAD] __aligned(4);/* property storage */
+               const void *ptmp;
                int  len;               /* new length of the property */
                int  ret;               /* return value */
 
@@ -268,13 +269,6 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
                pathp  = argv[2];
                prop   = argv[3];
-               if (argc == 4) {
-                       len = 0;
-               } else {
-                       ret = fdt_parse_prop(&argv[4], argc - 4, data, &len);
-                       if (ret != 0)
-                               return ret;
-               }
 
                nodeoffset = fdt_path_offset (working_fdt, pathp);
                if (nodeoffset < 0) {
@@ -286,6 +280,23 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        return 1;
                }
 
+               if (argc == 4) {
+                       len = 0;
+               } else {
+                       ptmp = fdt_getprop(working_fdt, nodeoffset, prop, &len);
+                       if (len > SCRATCHPAD) {
+                               printf("prop (%d) doesn't fit in scratchpad!\n",
+                                      len);
+                               return 1;
+                       }
+                       if (ptmp != NULL)
+                               memcpy(data, ptmp, len);
+
+                       ret = fdt_parse_prop(&argv[4], argc - 4, data, &len);
+                       if (ret != 0)
+                               return ret;
+               }
+
                ret = fdt_setprop(working_fdt, nodeoffset, prop, data, len);
                if (ret < 0) {
                        printf ("libfdt fdt_setprop(): %s\n", fdt_strerror(ret));
@@ -345,10 +356,12 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                if (curDepth == startDepth + 1)
                                        curIndex++;
                                if (subcmd[0] == 'n' && curIndex == reqIndex) {
-                                       const char *nodeName = fdt_get_name(
-                                           working_fdt, nextNodeOffset, NULL);
+                                       const char *node_name;
 
-                                       setenv(var, (char *)nodeName);
+                                       node_name = fdt_get_name(working_fdt,
+                                                                nextNodeOffset,
+                                                                NULL);
+                                       env_set(var, node_name);
                                        return 0;
                                }
                                nextNodeOffset = fdt_next_node(
@@ -358,7 +371,7 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        }
                        if (subcmd[0] == 's') {
                                /* get the num nodes at this level */
-                               setenv_ulong(var, curIndex + 1);
+                               env_set_ulong(var, curIndex + 1);
                        } else {
                                /* node index not found */
                                printf("libfdt node not found\n");
@@ -369,13 +382,14 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                working_fdt, nodeoffset, prop, &len);
                        if (len == 0) {
                                /* no property value */
-                               setenv(var, "");
+                               env_set(var, "");
                                return 0;
-                       } else if (len > 0) {
+                       } else if (nodep && len > 0) {
                                if (subcmd[0] == 'v') {
                                        int ret;
 
-                                       ret = fdt_value_setenv(nodep, len, var);
+                                       ret = fdt_value_env_set(nodep, len,
+                                                               var);
                                        if (ret != 0)
                                                return ret;
                                } else if (subcmd[0] == 'a') {
@@ -383,13 +397,13 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                        char buf[11];
 
                                        sprintf(buf, "0x%p", nodep);
-                                       setenv(var, buf);
+                                       env_set(var, buf);
                                } else if (subcmd[0] == 's') {
                                        /* Get size */
                                        char buf[11];
 
                                        sprintf(buf, "0x%08X", len);
-                                       setenv(var, buf);
+                                       env_set(var, buf);
                                } else
                                        return CMD_RET_USAGE;
                                return 0;
@@ -653,11 +667,10 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                if (!fdt_valid(&blob))
                        return CMD_RET_FAILURE;
 
-               ret = fdt_overlay_apply(working_fdt, blob);
-               if (ret) {
-                       printf("fdt_overlay_apply(): %s\n", fdt_strerror(ret));
+               /* apply method prints messages on error */
+               ret = fdt_overlay_apply_verbose(working_fdt, blob);
+               if (ret)
                        return CMD_RET_FAILURE;
-               }
        }
 #endif
        /* resize the fdt */
@@ -766,7 +779,11 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
 
                        cp = newp;
                        tmp = simple_strtoul(cp, &newp, 0);
-                       *(fdt32_t *)data = cpu_to_fdt32(tmp);
+                       if (*cp != '?')
+                               *(fdt32_t *)data = cpu_to_fdt32(tmp);
+                       else
+                               newp++;
+
                        data  += 4;
                        *len += 4;
 
@@ -962,7 +979,7 @@ static int fdt_print(const char *pathp, char *prop, int depth)
                        /* no property value */
                        printf("%s %s\n", pathp, prop);
                        return 0;
-               } else if (len > 0) {
+               } else if (nodep && len > 0) {
                        printf("%s = ", prop);
                        print_data (nodep, len);
                        printf("\n");