summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-07-12 08:23:58 +0200
committerWolfgang Denk <wd@denx.de>2012-07-12 08:23:58 +0200
commit0878222fed3fafbfd0b1f2e5a6b2da90a81e910d (patch)
treef88ba4ad1c5f06e6a772d5062c526d8153a71678 /net
parent0b15d51ed07db4c318d9c6b02b394ba5a3bc4296 (diff)
parent154177e14a141468374f438ed3096ab097b79976 (diff)
downloadtalos-obmc-uboot-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.tar.gz
talos-obmc-uboot-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.zip
Merge branch 'next' of git://git.denx.de/u-boot-net into next
* 'next' of git://git.denx.de/u-boot-net: net: Inline the new eth_setenv_enetaddr_by_index function net: allow setting env enetaddr from net device setting net/designware: Consecutive writes to the same register to be avoided CACHE: net: asix: Fix asix driver to work with data cache on net: phy: micrel: make ksz9021 phy accessible net: abort network initialization if the PHY driver fails phylib: phy_startup() should return an error code on failure net: tftp: fix type of block arg to store_block Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'net')
-rw-r--r--net/eth.c14
-rw-r--r--net/tftp.c2
2 files changed, 15 insertions, 1 deletions
diff --git a/net/eth.c b/net/eth.c
index d526264fa6..1a11ce1027 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -62,6 +62,15 @@ int eth_getenv_enetaddr_by_index(const char *base_name, int index,
return eth_getenv_enetaddr(enetvar, enetaddr);
}
+static inline int eth_setenv_enetaddr_by_index(const char *base_name, int index,
+ uchar *enetaddr)
+{
+ char enetvar[32];
+ sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index);
+ return eth_setenv_enetaddr(enetvar, enetaddr);
+}
+
+
static int eth_mac_skip(int index)
{
char enetvar[15];
@@ -205,6 +214,11 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
}
memcpy(dev->enetaddr, env_enetaddr, 6);
+ } else if (is_valid_ether_addr(dev->enetaddr)) {
+ eth_setenv_enetaddr_by_index(base_name, eth_number,
+ dev->enetaddr);
+ printf("\nWarning: %s using MAC address from net device\n",
+ dev->name);
}
if (dev->write_hwaddr &&
diff --git a/net/tftp.c b/net/tftp.c
index b2e08b4bfb..59a8ebb3cf 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -156,7 +156,7 @@ mcast_cleanup(void)
#endif /* CONFIG_MCAST_TFTP */
static inline void
-store_block(unsigned block, uchar *src, unsigned len)
+store_block(int block, uchar *src, unsigned len)
{
ulong offset = block * TftpBlkSize + TftpBlockWrapOffset;
ulong newsize = offset + len;
OpenPOWER on IntegriCloud