]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/fdt_support.c
Prepare v2009.06-rc2
[karo-tx-uboot.git] / common / fdt_support.c
index b5ee6e9601bf5322aa1216371f870af1f7e0bbd4..b54f8868d9daf1cd71777135fcdbb56ae1e4f9c8 100644 (file)
  */
 DECLARE_GLOBAL_DATA_PTR;
 
-/*
- * fdt points to our working device tree.
+/**
+ * fdt_getprop_u32_default - Find a node and return it's property or a default
+ *
+ * @fdt: ptr to device tree
+ * @path: path of node
+ * @prop: property name
+ * @dflt: default value if the property isn't found
+ *
+ * Convenience function to find a node and return it's property or a
+ * default value if it doesn't exist.
  */
-struct fdt_header *fdt;
+u32 fdt_getprop_u32_default(void *fdt, const char *path, const char *prop,
+                               const u32 dflt)
+{
+       const u32 *val;
+       int off;
 
-/********************************************************************/
+       off = fdt_path_offset(fdt, path);
+       if (off < 0)
+               return dflt;
+
+       val = fdt_getprop(fdt, off, prop, NULL);
+       if (val)
+               return *val;
+       else
+               return dflt;
+}
 
 /**
  * fdt_find_and_setprop: Find a node and set it's property
@@ -69,7 +90,7 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop,
 }
 
 #ifdef CONFIG_OF_STDOUT_VIA_ALIAS
-static int fdt_fixup_stdout(void *fdt, int choosenoff)
+static int fdt_fixup_stdout(void *fdt, int chosenoff)
 {
        int err = 0;
 #ifdef CONFIG_CONS_INDEX
@@ -88,7 +109,7 @@ static int fdt_fixup_stdout(void *fdt, int choosenoff)
                        err = -FDT_ERR_NOSPACE;
                        if (p) {
                                memcpy(p, path, len);
-                               err = fdt_setprop(fdt, choosenoff,
+                               err = fdt_setprop(fdt, chosenoff,
                                        "linux,stdout-path", p, len);
                                free(p);
                        }
@@ -105,310 +126,148 @@ static int fdt_fixup_stdout(void *fdt, int choosenoff)
 }
 #endif
 
-int fdt_chosen(void *fdt, ulong initrd_start, ulong initrd_end, int force)
+int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end, int force)
 {
        int   nodeoffset;
-       int   err;
-       u32   tmp;              /* used to set 32 bit integer properties */
-       char  *str;             /* used to set string properties */
-
-       err = fdt_check_header(fdt);
-       if (err < 0) {
-               printf("fdt_chosen: %s\n", fdt_strerror(err));
-               return err;
-       }
-
-       if (initrd_start && initrd_end) {
-               uint64_t addr, size;
-               int  total = fdt_num_mem_rsv(fdt);
-               int  j;
+       int   err, j, total;
+       u32   tmp;
+       const char *path;
+       uint64_t addr, size;
 
-               /*
-                * Look for an existing entry and update it.  If we don't find
-                * the entry, we will j be the next available slot.
-                */
-               for (j = 0; j < total; j++) {
-                       err = fdt_get_mem_rsv(fdt, j, &addr, &size);
-                       if (addr == initrd_start) {
-                               fdt_del_mem_rsv(fdt, j);
-                               break;
-                       }
-               }
+       /* Find the "chosen" node.  */
+       nodeoffset = fdt_path_offset (fdt, "/chosen");
 
-               err = fdt_add_mem_rsv(fdt, initrd_start, initrd_end - initrd_start + 1);
-               if (err < 0) {
-                       printf("fdt_chosen: %s\n", fdt_strerror(err));
-                       return err;
-               }
+       /* If there is no "chosen" node in the blob return */
+       if (nodeoffset < 0) {
+               printf("fdt_initrd: %s\n", fdt_strerror(nodeoffset));
+               return nodeoffset;
        }
 
-       /*
-        * Find the "chosen" node.
-        */
-       nodeoffset = fdt_path_offset (fdt, "/chosen");
-
-       /*
-        * If we have a "chosen" node already the "force the writing"
-        * is not set, our job is done.
-        */
-       if ((nodeoffset >= 0) && !force)
+       /* just return if initrd_start/end aren't valid */
+       if ((initrd_start == 0) || (initrd_end == 0))
                return 0;
 
+       total = fdt_num_mem_rsv(fdt);
+
        /*
-        * No "chosen" node in the blob: create it.
+        * Look for an existing entry and update it.  If we don't find
+        * the entry, we will j be the next available slot.
         */
-       if (nodeoffset < 0) {
-               /*
-                * Create a new node "/chosen" (offset 0 is root level)
-                */
-               nodeoffset = fdt_add_subnode(fdt, 0, "chosen");
-               if (nodeoffset < 0) {
-                       printf("WARNING: could not create /chosen %s.\n",
-                               fdt_strerror(nodeoffset));
-                       return nodeoffset;
+       for (j = 0; j < total; j++) {
+               err = fdt_get_mem_rsv(fdt, j, &addr, &size);
+               if (addr == initrd_start) {
+                       fdt_del_mem_rsv(fdt, j);
+                       break;
                }
        }
 
-       /*
-        * Update pre-existing properties, create them if non-existant.
-        */
-       str = getenv("bootargs");
-       if (str != NULL) {
-               err = fdt_setprop(fdt, nodeoffset,
-                       "bootargs", str, strlen(str)+1);
-               if (err < 0)
-                       printf("WARNING: could not set bootargs %s.\n",
-                               fdt_strerror(err));
+       err = fdt_add_mem_rsv(fdt, initrd_start, initrd_end - initrd_start + 1);
+       if (err < 0) {
+               printf("fdt_initrd: %s\n", fdt_strerror(err));
+               return err;
        }
-       if (initrd_start && initrd_end) {
+
+       path = fdt_getprop(fdt, nodeoffset, "linux,initrd-start", NULL);
+       if ((path == NULL) || force) {
                tmp = __cpu_to_be32(initrd_start);
                err = fdt_setprop(fdt, nodeoffset,
-                        "linux,initrd-start", &tmp, sizeof(tmp));
-               if (err < 0)
+                       "linux,initrd-start", &tmp, sizeof(tmp));
+               if (err < 0) {
                        printf("WARNING: "
                                "could not set linux,initrd-start %s.\n",
                                fdt_strerror(err));
+                       return err;
+               }
                tmp = __cpu_to_be32(initrd_end);
                err = fdt_setprop(fdt, nodeoffset,
                        "linux,initrd-end", &tmp, sizeof(tmp));
-               if (err < 0)
+               if (err < 0) {
                        printf("WARNING: could not set linux,initrd-end %s.\n",
                                fdt_strerror(err));
-       }
 
-#ifdef CONFIG_OF_STDOUT_VIA_ALIAS
-       err = fdt_fixup_stdout(fdt, nodeoffset);
-#endif
-
-#ifdef OF_STDOUT_PATH
-       err = fdt_setprop(fdt, nodeoffset,
-               "linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1);
-       if (err < 0)
-               printf("WARNING: could not set linux,stdout-path %s.\n",
-                       fdt_strerror(err));
-#endif
+                       return err;
+               }
+       }
 
-       return err;
+       return 0;
 }
 
-/********************************************************************/
-
-#ifdef CONFIG_OF_HAS_UBOOT_ENV
-
-/* Function that returns a character from the environment */
-extern uchar(*env_get_char) (int);
-
-
-int fdt_env(void *fdt)
+int fdt_chosen(void *fdt, int force)
 {
        int   nodeoffset;
        int   err;
-       int   k, nxt;
-       int i;
-       static char tmpenv[256];
+       char  *str;             /* used to set string properties */
+       const char *path;
 
        err = fdt_check_header(fdt);
        if (err < 0) {
-               printf("fdt_env: %s\n", fdt_strerror(err));
+               printf("fdt_chosen: %s\n", fdt_strerror(err));
                return err;
        }
 
        /*
-        * See if we already have a "u-boot-env" node, delete it if so.
-        * Then create a new empty node.
+        * Find the "chosen" node.
         */
-       nodeoffset = fdt_path_offset (fdt, "/u-boot-env");
-       if (nodeoffset >= 0) {
-               err = fdt_del_node(fdt, nodeoffset);
-               if (err < 0) {
-                       printf("fdt_env: %s\n", fdt_strerror(err));
-                       return err;
-               }
-       }
+       nodeoffset = fdt_path_offset (fdt, "/chosen");
+
        /*
-        * Create a new node "/u-boot-env" (offset 0 is root level)
+        * If there is no "chosen" node in the blob, create it.
         */
-       nodeoffset = fdt_add_subnode(fdt, 0, "u-boot-env");
        if (nodeoffset < 0) {
-               printf("WARNING: could not create /u-boot-env %s.\n",
-                       fdt_strerror(nodeoffset));
-               return nodeoffset;
-       }
-
-       for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
-               char *s, *lval, *rval;
-
-               /*
-                * Find the end of the name=definition
-                */
-               for (nxt = i; env_get_char(nxt) != '\0'; ++nxt)
-                       ;
-               s = tmpenv;
-               for (k = i; k < nxt && s < &tmpenv[sizeof(tmpenv) - 1]; ++k)
-                       *s++ = env_get_char(k);
-               *s++ = '\0';
-               lval = tmpenv;
                /*
-                * Find the first '=': it separates the name from the value
+                * Create a new node "/chosen" (offset 0 is root level)
                 */
-               s = strchr(tmpenv, '=');
-               if (s != NULL) {
-                       *s++ = '\0';
-                       rval = s;
-               } else
-                       continue;
-               err = fdt_setprop(fdt, nodeoffset, lval, rval, strlen(rval)+1);
-               if (err < 0) {
-                       printf("WARNING: could not set %s %s.\n",
-                               lval, fdt_strerror(err));
-                       return err;
+               nodeoffset = fdt_add_subnode(fdt, 0, "chosen");
+               if (nodeoffset < 0) {
+                       printf("WARNING: could not create /chosen %s.\n",
+                               fdt_strerror(nodeoffset));
+                       return nodeoffset;
                }
        }
-       return 0;
-}
-#endif /* ifdef CONFIG_OF_HAS_UBOOT_ENV */
-
-/********************************************************************/
-
-#ifdef CONFIG_OF_HAS_BD_T
-
-#define BDM(x) {       .name = #x, .offset = offsetof(bd_t, bi_ ##x ) }
-
-static const struct {
-       const char *name;
-       int offset;
-} bd_map[] = {
-       BDM(memstart),
-       BDM(memsize),
-       BDM(flashstart),
-       BDM(flashsize),
-       BDM(flashoffset),
-       BDM(sramstart),
-       BDM(sramsize),
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) \
-       || defined(CONFIG_E500)
-       BDM(immr_base),
-#endif
-#if defined(CONFIG_MPC5xxx)
-       BDM(mbar_base),
-#endif
-#if defined(CONFIG_MPC83XX)
-       BDM(immrbar),
-#endif
-#if defined(CONFIG_MPC8220)
-       BDM(mbar_base),
-       BDM(inpfreq),
-       BDM(pcifreq),
-       BDM(pevfreq),
-       BDM(flbfreq),
-       BDM(vcofreq),
-#endif
-       BDM(bootflags),
-       BDM(ip_addr),
-       BDM(intfreq),
-       BDM(busfreq),
-#ifdef CONFIG_CPM2
-       BDM(cpmfreq),
-       BDM(brgfreq),
-       BDM(sccfreq),
-       BDM(vco),
-#endif
-#if defined(CONFIG_MPC5xxx)
-       BDM(ipbfreq),
-       BDM(pcifreq),
-#endif
-       BDM(baudrate),
-};
-
-
-int fdt_bd_t(void *fdt)
-{
-       bd_t *bd = gd->bd;
-       int   nodeoffset;
-       int   err;
-       u32   tmp;              /* used to set 32 bit integer properties */
-       int i;
-
-       err = fdt_check_header(fdt);
-       if (err < 0) {
-               printf("fdt_bd_t: %s\n", fdt_strerror(err));
-               return err;
-       }
 
        /*
-        * See if we already have a "bd_t" node, delete it if so.
-        * Then create a new empty node.
+        * Create /chosen properites that don't exist in the fdt.
+        * If the property exists, update it only if the "force" parameter
+        * is true.
         */
-       nodeoffset = fdt_path_offset (fdt, "/bd_t");
-       if (nodeoffset >= 0) {
-               err = fdt_del_node(fdt, nodeoffset);
-               if (err < 0) {
-                       printf("fdt_bd_t: %s\n", fdt_strerror(err));
-                       return err;
+       str = getenv("bootargs");
+       if (str != NULL) {
+               path = fdt_getprop(fdt, nodeoffset, "bootargs", NULL);
+               if ((path == NULL) || force) {
+                       err = fdt_setprop(fdt, nodeoffset,
+                               "bootargs", str, strlen(str)+1);
+                       if (err < 0)
+                               printf("WARNING: could not set bootargs %s.\n",
+                                       fdt_strerror(err));
                }
        }
-       /*
-        * Create a new node "/bd_t" (offset 0 is root level)
-        */
-       nodeoffset = fdt_add_subnode(fdt, 0, "bd_t");
-       if (nodeoffset < 0) {
-               printf("WARNING: could not create /bd_t %s.\n",
-                       fdt_strerror(nodeoffset));
-               printf("fdt_bd_t: %s\n", fdt_strerror(nodeoffset));
-               return nodeoffset;
-       }
-       /*
-        * Use the string/pointer structure to create the entries...
-        */
-       for (i = 0; i < sizeof(bd_map)/sizeof(bd_map[0]); i++) {
-               tmp = cpu_to_be32(getenv("bootargs"));
+
+#ifdef CONFIG_OF_STDOUT_VIA_ALIAS
+       path = fdt_getprop(fdt, nodeoffset, "linux,stdout-path", NULL);
+       if ((path == NULL) || force)
+               err = fdt_fixup_stdout(fdt, nodeoffset);
+#endif
+
+#ifdef OF_STDOUT_PATH
+       path = fdt_getprop(fdt, nodeoffset, "linux,stdout-path", NULL);
+       if ((path == NULL) || force) {
                err = fdt_setprop(fdt, nodeoffset,
-                       bd_map[i].name, &tmp, sizeof(tmp));
+                       "linux,stdout-path", OF_STDOUT_PATH, strlen(OF_STDOUT_PATH)+1);
                if (err < 0)
-                       printf("WARNING: could not set %s %s.\n",
-                               bd_map[i].name, fdt_strerror(err));
+                       printf("WARNING: could not set linux,stdout-path %s.\n",
+                               fdt_strerror(err));
        }
-       /*
-        * Add a couple of oddball entries...
-        */
-       err = fdt_setprop(fdt, nodeoffset, "enetaddr", &bd->bi_enetaddr, 6);
-       if (err < 0)
-               printf("WARNING: could not set enetaddr %s.\n",
-                       fdt_strerror(err));
-       err = fdt_setprop(fdt, nodeoffset, "ethspeed", &bd->bi_ethspeed, 4);
-       if (err < 0)
-               printf("WARNING: could not set ethspeed %s.\n",
-                       fdt_strerror(err));
-       return 0;
+#endif
+
+       return err;
 }
-#endif /* ifdef CONFIG_OF_HAS_BD_T */
 
 void do_fixup_by_path(void *fdt, const char *path, const char *prop,
                      const void *val, int len, int create)
 {
 #if defined(DEBUG)
        int i;
-       debug("Updating property '%s/%s' = ", node, prop);
+       debug("Updating property '%s/%s' = ", path, prop);
        for (i = 0; i < len; i++)
                debug(" %.2x", *(u8*)(val+i));
        debug("\n");
@@ -434,7 +293,7 @@ void do_fixup_by_prop(void *fdt,
        int off;
 #if defined(DEBUG)
        int i;
-       debug("Updating property '%s/%s' = ", node, prop);
+       debug("Updating property '%s' = ", prop);
        for (i = 0; i < len; i++)
                debug(" %.2x", *(u8*)(val+i));
        debug("\n");
@@ -461,7 +320,7 @@ void do_fixup_by_compat(void *fdt, const char *compat,
        int off = -1;
 #if defined(DEBUG)
        int i;
-       debug("Updating property '%s/%s' = ", node, prop);
+       debug("Updating property '%s' = ", prop);
        for (i = 0; i < len; i++)
                debug(" %.2x", *(u8*)(val+i));
        debug("\n");
@@ -559,52 +418,277 @@ int fdt_fixup_memory(void *blob, u64 start, u64 size)
        return 0;
 }
 
-#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\
-    defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3)
-
-void fdt_fixup_ethernet(void *fdt, bd_t *bd)
+void fdt_fixup_ethernet(void *fdt)
 {
-       int node;
+       int node, i, j;
+       char enet[16], *tmp, *end;
+       char mac[16] = "ethaddr";
        const char *path;
+       unsigned char mac_addr[6];
 
        node = fdt_path_offset(fdt, "/aliases");
-       if (node >= 0) {
-#if defined(CONFIG_HAS_ETH0)
-               path = fdt_getprop(fdt, node, "ethernet0", NULL);
-               if (path) {
-                       do_fixup_by_path(fdt, path, "mac-address",
-                               bd->bi_enetaddr, 6, 0);
-                       do_fixup_by_path(fdt, path, "local-mac-address",
-                               bd->bi_enetaddr, 6, 1);
+       if (node < 0)
+               return;
+
+       i = 0;
+       while ((tmp = getenv(mac)) != NULL) {
+               sprintf(enet, "ethernet%d", i);
+               path = fdt_getprop(fdt, node, enet, NULL);
+               if (!path) {
+                       debug("No alias for %s\n", enet);
+                       sprintf(mac, "eth%daddr", ++i);
+                       continue;
                }
-#endif
-#if defined(CONFIG_HAS_ETH1)
-               path = fdt_getprop(fdt, node, "ethernet1", NULL);
-               if (path) {
-                       do_fixup_by_path(fdt, path, "mac-address",
-                               bd->bi_enet1addr, 6, 0);
-                       do_fixup_by_path(fdt, path, "local-mac-address",
-                               bd->bi_enet1addr, 6, 1);
+
+               for (j = 0; j < 6; j++) {
+                       mac_addr[j] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
+                       if (tmp)
+                               tmp = (*end) ? end+1 : end;
                }
-#endif
-#if defined(CONFIG_HAS_ETH2)
-               path = fdt_getprop(fdt, node, "ethernet2", NULL);
-               if (path) {
-                       do_fixup_by_path(fdt, path, "mac-address",
-                               bd->bi_enet2addr, 6, 0);
-                       do_fixup_by_path(fdt, path, "local-mac-address",
-                               bd->bi_enet2addr, 6, 1);
+
+               do_fixup_by_path(fdt, path, "mac-address", &mac_addr, 6, 0);
+               do_fixup_by_path(fdt, path, "local-mac-address",
+                               &mac_addr, 6, 1);
+
+               sprintf(mac, "eth%daddr", ++i);
+       }
+}
+
+#ifdef CONFIG_HAS_FSL_DR_USB
+void fdt_fixup_dr_usb(void *blob, bd_t *bd)
+{
+       char *mode;
+       char *type;
+       const char *compat = "fsl-usb2-dr";
+       const char *prop_mode = "dr_mode";
+       const char *prop_type = "phy_type";
+       int node_offset;
+       int err;
+
+       mode = getenv("usb_dr_mode");
+       type = getenv("usb_phy_type");
+       if (!mode && !type)
+               return;
+
+       node_offset = fdt_node_offset_by_compatible(blob, 0, compat);
+       if (node_offset < 0) {
+               printf("WARNING: could not find compatible node %s: %s.\n",
+                       compat, fdt_strerror(node_offset));
+               return;
+       }
+
+       if (mode) {
+               err = fdt_setprop(blob, node_offset, prop_mode, mode,
+                                 strlen(mode) + 1);
+               if (err < 0)
+                       printf("WARNING: could not set %s for %s: %s.\n",
+                              prop_mode, compat, fdt_strerror(err));
+       }
+
+       if (type) {
+               err = fdt_setprop(blob, node_offset, prop_type, type,
+                                 strlen(type) + 1);
+               if (err < 0)
+                       printf("WARNING: could not set %s for %s: %s.\n",
+                              prop_type, compat, fdt_strerror(err));
+       }
+}
+#endif /* CONFIG_HAS_FSL_DR_USB */
+
+#if defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx)
+/*
+ * update crypto node properties to a specified revision of the SEC
+ * called with sec_rev == 0 if not on an mpc8xxxE processor
+ */
+void fdt_fixup_crypto_node(void *blob, int sec_rev)
+{
+       const struct sec_rev_prop {
+               u32 sec_rev;
+               u32 num_channels;
+               u32 channel_fifo_len;
+               u32 exec_units_mask;
+               u32 descriptor_types_mask;
+       } sec_rev_prop_list [] = {
+               { 0x0200, 4, 24, 0x07e, 0x01010ebf }, /* SEC 2.0 */
+               { 0x0201, 4, 24, 0x0fe, 0x012b0ebf }, /* SEC 2.1 */
+               { 0x0202, 1, 24, 0x04c, 0x0122003f }, /* SEC 2.2 */
+               { 0x0204, 4, 24, 0x07e, 0x012b0ebf }, /* SEC 2.4 */
+               { 0x0300, 4, 24, 0x9fe, 0x03ab0ebf }, /* SEC 3.0 */
+               { 0x0303, 4, 24, 0x97c, 0x03ab0abf }, /* SEC 3.3 */
+       };
+       char compat_strlist[ARRAY_SIZE(sec_rev_prop_list) *
+                           sizeof("fsl,secX.Y")];
+       int crypto_node, sec_idx, err;
+       char *p;
+       u32 val;
+
+       /* locate crypto node based on lowest common compatible */
+       crypto_node = fdt_node_offset_by_compatible(blob, -1, "fsl,sec2.0");
+       if (crypto_node == -FDT_ERR_NOTFOUND)
+               return;
+
+       /* delete it if not on an E-processor */
+       if (crypto_node > 0 && !sec_rev) {
+               fdt_del_node(blob, crypto_node);
+               return;
+       }
+
+       /* else we got called for possible uprev */
+       for (sec_idx = 0; sec_idx < ARRAY_SIZE(sec_rev_prop_list); sec_idx++)
+               if (sec_rev_prop_list[sec_idx].sec_rev == sec_rev)
+                       break;
+
+       if (sec_idx == ARRAY_SIZE(sec_rev_prop_list)) {
+               puts("warning: unknown SEC revision number\n");
+               return;
+       }
+
+       val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].num_channels);
+       err = fdt_setprop(blob, crypto_node, "fsl,num-channels", &val, 4);
+       if (err < 0)
+               printf("WARNING: could not set crypto property: %s\n",
+                      fdt_strerror(err));
+
+       val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].descriptor_types_mask);
+       err = fdt_setprop(blob, crypto_node, "fsl,descriptor-types-mask", &val, 4);
+       if (err < 0)
+               printf("WARNING: could not set crypto property: %s\n",
+                      fdt_strerror(err));
+
+       val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].exec_units_mask);
+       err = fdt_setprop(blob, crypto_node, "fsl,exec-units-mask", &val, 4);
+       if (err < 0)
+               printf("WARNING: could not set crypto property: %s\n",
+                      fdt_strerror(err));
+
+       val = cpu_to_fdt32(sec_rev_prop_list[sec_idx].channel_fifo_len);
+       err = fdt_setprop(blob, crypto_node, "fsl,channel-fifo-len", &val, 4);
+       if (err < 0)
+               printf("WARNING: could not set crypto property: %s\n",
+                      fdt_strerror(err));
+
+       val = 0;
+       while (sec_idx >= 0) {
+               p = compat_strlist + val;
+               val += sprintf(p, "fsl,sec%d.%d",
+                       (sec_rev_prop_list[sec_idx].sec_rev & 0xff00) >> 8,
+                       sec_rev_prop_list[sec_idx].sec_rev & 0x00ff) + 1;
+               sec_idx--;
+       }
+       err = fdt_setprop(blob, crypto_node, "compatible", &compat_strlist, val);
+       if (err < 0)
+               printf("WARNING: could not set crypto property: %s\n",
+                      fdt_strerror(err));
+}
+#endif /* defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx) */
+
+/* Resize the fdt to its actual size + a bit of padding */
+int fdt_resize(void *blob)
+{
+       int i;
+       uint64_t addr, size;
+       int total, ret;
+       uint actualsize;
+
+       if (!blob)
+               return 0;
+
+       total = fdt_num_mem_rsv(blob);
+       for (i = 0; i < total; i++) {
+               fdt_get_mem_rsv(blob, i, &addr, &size);
+               if (addr == (uint64_t)(u32)blob) {
+                       fdt_del_mem_rsv(blob, i);
+                       break;
                }
+       }
+
+       /*
+        * Calculate the actual size of the fdt
+        * plus the size needed for fdt_add_mem_rsv
+        */
+       actualsize = fdt_off_dt_strings(blob) +
+               fdt_size_dt_strings(blob) + sizeof(struct fdt_reserve_entry);
+
+       /* Make it so the fdt ends on a page boundary */
+       actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000);
+       actualsize = actualsize - ((uint)blob & 0xfff);
+
+       /* Change the fdt header to reflect the correct size */
+       fdt_set_totalsize(blob, actualsize);
+
+       /* Add the new reservation */
+       ret = fdt_add_mem_rsv(blob, (uint)blob, actualsize);
+       if (ret < 0)
+               return ret;
+
+       return actualsize;
+}
+
+#ifdef CONFIG_PCI
+#define CONFIG_SYS_PCI_NR_INBOUND_WIN 3
+
+#define FDT_PCI_PREFETCH       (0x40000000)
+#define FDT_PCI_MEM32          (0x02000000)
+#define FDT_PCI_IO             (0x01000000)
+#define FDT_PCI_MEM64          (0x03000000)
+
+int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose) {
+
+       int addrcell, sizecell, len, r;
+       u32 *dma_range;
+       /* sized based on pci addr cells, size-cells, & address-cells */
+       u32 dma_ranges[(3 + 2 + 2) * CONFIG_SYS_PCI_NR_INBOUND_WIN];
+
+       addrcell = fdt_getprop_u32_default(blob, "/", "#address-cells", 1);
+       sizecell = fdt_getprop_u32_default(blob, "/", "#size-cells", 1);
+
+       dma_range = &dma_ranges[0];
+       for (r = 0; r < hose->region_count; r++) {
+               u64 bus_start, phys_start, size;
+
+               /* skip if !PCI_REGION_SYS_MEMORY */
+               if (!(hose->regions[r].flags & PCI_REGION_SYS_MEMORY))
+                       continue;
+
+               bus_start = (u64)hose->regions[r].bus_start;
+               phys_start = (u64)hose->regions[r].phys_start;
+               size = (u64)hose->regions[r].size;
+
+               dma_range[0] = 0;
+               if (size > 0x100000000ull)
+                       dma_range[0] |= FDT_PCI_MEM64;
+               else
+                       dma_range[0] |= FDT_PCI_MEM32;
+               if (hose->regions[r].flags & PCI_REGION_PREFETCH)
+                       dma_range[0] |= FDT_PCI_PREFETCH;
+#ifdef CONFIG_SYS_PCI_64BIT
+               dma_range[1] = bus_start >> 32;
+#else
+               dma_range[1] = 0;
 #endif
-#if defined(CONFIG_HAS_ETH3)
-               path = fdt_getprop(fdt, node, "ethernet3", NULL);
-               if (path) {
-                       do_fixup_by_path(fdt, path, "mac-address",
-                               bd->bi_enet3addr, 6, 0);
-                       do_fixup_by_path(fdt, path, "local-mac-address",
-                               bd->bi_enet3addr, 6, 1);
+               dma_range[2] = bus_start & 0xffffffff;
+
+               if (addrcell == 2) {
+                       dma_range[3] = phys_start >> 32;
+                       dma_range[4] = phys_start & 0xffffffff;
+               } else {
+                       dma_range[3] = phys_start & 0xffffffff;
                }
-#endif
+
+               if (sizecell == 2) {
+                       dma_range[3 + addrcell + 0] = size >> 32;
+                       dma_range[3 + addrcell + 1] = size & 0xffffffff;
+               } else {
+                       dma_range[3 + addrcell + 0] = size & 0xffffffff;
+               }
+
+               dma_range += (3 + addrcell + sizecell);
        }
+
+       len = dma_range - &dma_ranges[0];
+       if (len)
+               fdt_setprop(blob, phb_off, "dma-ranges", &dma_ranges[0], len*4);
+
+       return 0;
 }
 #endif