diff options
| author | Tom Rini <[email protected]> | 2019-12-09 13:48:22 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-12-09 13:48:22 -0500 |
| commit | ac1ca99926606faf5e2d37771680ed97d66ee5ab (patch) | |
| tree | fee2ab721b2a27800726b8a4d3528bfdf1d5dba6 /cmd | |
| parent | 0c5c3f293554614416a188d16a8c05e0a6c5bfbb (diff) | |
| parent | 2c4e067d493d031d1267eea1c635d1eab93ce8f7 (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 18 | ||||
| -rw-r--r-- | cmd/Makefile | 4 | ||||
| -rw-r--r-- | cmd/ethsw.c | 2 | ||||
| -rw-r--r-- | cmd/nvedit.c | 2 | ||||
| -rw-r--r-- | cmd/pxe_utils.c | 2 |
5 files changed, 20 insertions, 8 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index bc8318d7fa4..1e4cf146c50 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1473,8 +1473,22 @@ config CMD_NFS config CMD_MII bool "mii" - help - Enable MII utility commands. + imply CMD_MDIO + help + If set, allows 802.3(clause 22) MII Management functions interface access + The management interface specified in Clause 22 provides + a simple, two signal, serial interface to connect a + Station Management entity and a managed PHY for providing access + to management parameters and services. + The interface is referred to as the MII management interface. + +config CMD_MDIO + bool "mdio" + depends on PHYLIB + help + If set, allows Enable 802.3(clause 45) MDIO interface registers access + The MDIO interface is orthogonal to the MII interface and extends + it by adding access to more registers through indirect addressing. config CMD_PING bool "ping" diff --git a/cmd/Makefile b/cmd/Makefile index e87c2f16259..3ac71045465 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -89,9 +89,7 @@ obj-$(CONFIG_CMD_MEMORY) += mem.o obj-$(CONFIG_CMD_IO) += io.o obj-$(CONFIG_CMD_MFSL) += mfsl.o obj-$(CONFIG_CMD_MII) += mii.o -ifdef CONFIG_PHYLIB -obj-$(CONFIG_CMD_MII) += mdio.o -endif +obj-$(CONFIG_CMD_MDIO) += mdio.o obj-$(CONFIG_CMD_MISC) += misc.o obj-$(CONFIG_CMD_MMC) += mmc.o obj-$(CONFIG_MP) += mp.o diff --git a/cmd/ethsw.c b/cmd/ethsw.c index 88468057997..8d271ce1f3c 100644 --- a/cmd/ethsw.c +++ b/cmd/ethsw.c @@ -864,7 +864,7 @@ static int keyword_match_mac_addr(enum ethsw_keyword_id key_id, int argc, return 0; } - eth_parse_enetaddr(argv[*argc_nr + 1], parsed_cmd->ethaddr); + string_to_enetaddr(argv[*argc_nr + 1], parsed_cmd->ethaddr); if (is_broadcast_ethaddr(parsed_cmd->ethaddr)) { memset(parsed_cmd->ethaddr, 0xFF, sizeof(parsed_cmd->ethaddr)); diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 3420e0b985b..81d94cd193c 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -361,7 +361,7 @@ ulong env_get_hex(const char *varname, ulong default_val) int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr) { - eth_parse_enetaddr(env_get(name), enetaddr); + string_to_enetaddr(env_get(name), enetaddr); return is_valid_ethaddr(enetaddr); } diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c index 42b584ead32..a636346bb51 100644 --- a/cmd/pxe_utils.c +++ b/cmd/pxe_utils.c @@ -22,7 +22,7 @@ #include "pxe_utils.h" -#define MAX_TFTP_PATH_LEN 127 +#define MAX_TFTP_PATH_LEN 512 bool is_pxe; |