diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-29 20:30:33 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-29 20:30:33 (GMT) |
| commit | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /include | |
| parent | 446d37c1acc76680770400fd90e6c502e49d72df (diff) | |
| parent | ac1d31380618f3f68bf7f05b73b6ab0cdeab0e9f (diff) | |
| download | u-boot-fsl-qoriq-0eb4cf9c14315e1976a116de75da6f420ac0e8dd.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include')
| -rw-r--r-- | include/miiphy.h | 2 | ||||
| -rw-r--r-- | include/net.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/miiphy.h b/include/miiphy.h index 088797e..af12274 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -59,7 +59,9 @@ struct phy_device *mdio_phydev_for_ethname(const char *devname); void miiphy_listdev(void); struct mii_dev *mdio_alloc(void); +void mdio_free(struct mii_dev *bus); int mdio_register(struct mii_dev *bus); +int mdio_unregister(struct mii_dev *bus); void mdio_list_devices(void); #ifdef CONFIG_BITBANGMII diff --git a/include/net.h b/include/net.h index 3a787cc..ebed29a 100644 --- a/include/net.h +++ b/include/net.h @@ -233,8 +233,8 @@ void eth_set_current(void); /* set nterface to ethcur var */ int eth_get_dev_index(void); /* get the device index */ void eth_parse_enetaddr(const char *addr, uchar *enetaddr); -int eth_getenv_enetaddr(char *name, uchar *enetaddr); -int eth_setenv_enetaddr(char *name, const uchar *enetaddr); +int eth_getenv_enetaddr(const char *name, uchar *enetaddr); +int eth_setenv_enetaddr(const char *name, const uchar *enetaddr); /* * Get the hardware address for an ethernet interface . @@ -516,7 +516,7 @@ enum proto_t { TFTPSRV, TFTPPUT, LINKLOCAL }; -extern char net_boot_file_name[128];/* Boot File name */ +extern char net_boot_file_name[1024];/* Boot File name */ /* The actual transferred size of the bootfile (in bytes) */ extern u32 net_boot_file_size; /* Boot file size in blocks as reported by the DHCP server */ |