Merge branch 'master' of git://git.denx.de/u-boot-i2c

* 'master' of git://git.denx.de/u-boot-i2c:
  mx28evk: Add I2C support
  mxs-i2c: Fix internal address byte order
  mxc_i2c: remove setting speed at each start
  mx6qsabrelite: add i2c support
  mxc_i2c: specify i2c base address in config file

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h
index a1ba68b1b49d3d38c1cae5b63e8ac83db2c25acd..50f4b69cd312caa547430cdc770be3b4aef828d4 100644 (file)
--- a/drivers/net/sh_eth.h
+++ b/drivers/net/sh_eth.h
@@ -452,17 +452,16 @@ enum ECSR_STATUS_BIT {
 
 /* ECSIPR */
 enum ECSIPR_STATUS_MASK_BIT {
-#if defined(CONFIG_CPU_SH7724)
+#if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757)
+       ECSIPR_BRCRXIP = 0x20,
        ECSIPR_PSRTOIP = 0x10,
-       ECSIPR_LCHNGIP = 0x04,
-       ECSIPR_ICDIP = 0x01,
 #elif defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734)
        ECSIPR_PSRTOIP = 0x10,
        ECSIPR_PHYIP = 0x08,
+#endif
        ECSIPR_LCHNGIP = 0x04,
        ECSIPR_MPDIP = 0x02,
        ECSIPR_ICDIP = 0x01,
-#endif
 };
 
 #if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734)

diff --git a/net/arp.c b/net/arp.c
index bac4cab5efa55153c14c620b0be47598a82b05f4..8e1d2edd6207a43e4ad16a5d42a3aad8147427ce 100644 (file)
--- a/net/arp.c
+++ b/net/arp.c
@@ -194,7 +194,7 @@ void ArpReceive(struct ethernet_hdr *et, struct ip_udp_hdr *ip, int len)
 #ifdef CONFIG_KEEP_SERVERADDR
                if (NetServerIP == NetArpWaitPacketIP) {
                        char buf[20];
-                       sprintf(buf, "%pM", arp->ar_sha);
+                       sprintf(buf, "%pM", &arp->ar_sha);
                        setenv("serveraddr", buf);
                }
 #endif