Merge git://git.denx.de/u-boot-dm

diff --combined drivers/net/cpsw.c
index 511a965c9b0c0e50265a505cccb6fbb15c690441,8a2f88a0955d63e4f450ad4be734a934de9e91db..81ccc61a60dcece58db7f99f37282dae0d9cedc4
--- 1/drivers/net/cpsw.c
--- 2/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@@ -908,7 -908,7 +908,7 @@@ static int _cpsw_send(struct cpsw_priv 
        int timeout = CPDMA_TIMEOUT;
  
        flush_dcache_range((unsigned long)packet,
 -                         (unsigned long)packet + length);
 +                         (unsigned long)packet + ALIGN(length, PKTALIGN));
  
        /* first reap completed packets */
        while (timeout-- &&
@@@ -1146,7 -1146,8 +1146,8 @@@ static const struct eth_ops cpsw_eth_op
  
  static inline fdt_addr_t cpsw_get_addr_by_node(const void *fdt, int node)
  {
-       return fdtdec_get_addr_size_auto_noparent(fdt, node, "reg", 0, NULL);
+       return fdtdec_get_addr_size_auto_noparent(fdt, node, "reg", 0, NULL,
+                                                 false);
  }
  
  static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)