Subtree merge tag 'v6.12-dts' of dts repo [1] into dts/upstream

[J-u-boot.git] / cmd / net.c

diff --git a/cmd/net.c b/cmd/net.c
index 53ce2bc5d0ce32bc47801c5617a975bd98f3e985..79525f73a51216fa53e453451b77d9bb9616cded 100644 (file)
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -196,6 +196,8 @@ U_BOOT_CMD(
 #if defined(CONFIG_CMD_WGET)
 static int do_wget(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
 {
+       wget_info = &default_wget_info;
+
        return netboot_common(WGET, cmdtp, argc, argv);
 }
 
@@ -674,118 +676,3 @@ U_BOOT_CMD(
 );
 
 #endif  /* CONFIG_CMD_LINK_LOCAL */
-
-static int do_net_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       const struct udevice *current = eth_get_dev();
-       unsigned char env_enetaddr[ARP_HLEN];
-       const struct udevice *dev;
-       struct uclass *uc;
-
-       uclass_id_foreach_dev(UCLASS_ETH, dev, uc) {
-               eth_env_get_enetaddr_by_index("eth", dev_seq(dev), env_enetaddr);
-               printf("eth%d : %s %pM %s\n", dev_seq(dev), dev->name, env_enetaddr,
-                      current == dev ? "active" : "");
-       }
-       return CMD_RET_SUCCESS;
-}
-
-static int do_net_stats(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       int nstats, err, i, off;
-       struct udevice *dev;
-       u64 *values;
-       u8 *strings;
-
-       if (argc < 2)
-               return CMD_RET_USAGE;
-
-       err = uclass_get_device_by_name(UCLASS_ETH, argv[1], &dev);
-       if (err) {
-               printf("Could not find device %s\n", argv[1]);
-               return CMD_RET_FAILURE;
-       }
-
-       if (!eth_get_ops(dev)->get_sset_count ||
-           !eth_get_ops(dev)->get_strings ||
-           !eth_get_ops(dev)->get_stats) {
-               printf("Driver does not implement stats dump!\n");
-               return CMD_RET_FAILURE;
-       }
-
-       nstats = eth_get_ops(dev)->get_sset_count(dev);
-       strings = kcalloc(nstats, ETH_GSTRING_LEN, GFP_KERNEL);
-       if (!strings)
-               return CMD_RET_FAILURE;
-
-       values = kcalloc(nstats, sizeof(u64), GFP_KERNEL);
-       if (!values)
-               goto err_free_strings;
-
-       eth_get_ops(dev)->get_strings(dev, strings);
-       eth_get_ops(dev)->get_stats(dev, values);
-
-       off = 0;
-       for (i = 0; i < nstats; i++) {
-               printf("  %s: %llu\n", &strings[off], values[i]);
-               off += ETH_GSTRING_LEN;
-       };
-
-       return CMD_RET_SUCCESS;
-
-err_free_strings:
-       kfree(strings);
-
-       return CMD_RET_FAILURE;
-}
-
-static struct cmd_tbl cmd_net[] = {
-       U_BOOT_CMD_MKENT(list, 1, 0, do_net_list, "", ""),
-       U_BOOT_CMD_MKENT(stats, 2, 0, do_net_stats, "", ""),
-};
-
-static int do_net(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
-{
-       struct cmd_tbl *cp;
-
-       cp = find_cmd_tbl(argv[1], cmd_net, ARRAY_SIZE(cmd_net));
-
-       /* Drop the net command */
-       argc--;
-       argv++;
-
-       if (!cp || argc > cp->maxargs)
-               return CMD_RET_USAGE;
-       if (flag == CMD_FLAG_REPEAT && !cmd_is_repeatable(cp))
-               return CMD_RET_SUCCESS;
-
-       return cp->cmd(cmdtp, flag, argc, argv);
-}
-
-U_BOOT_CMD(
-       net, 3, 1, do_net,
-       "NET sub-system",
-       "list - list available devices\n"
-       "stats <device> - dump statistics for specified device\n"
-);
-
-#if defined(CONFIG_CMD_NCSI)
-static int do_ncsi(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[])
-{
-       if (!phy_interface_is_ncsi() || !ncsi_active()) {
-               printf("Device not configured for NC-SI\n");
-               return CMD_RET_FAILURE;
-       }
-
-       if (net_loop(NCSI) < 0)
-               return CMD_RET_FAILURE;
-
-       return CMD_RET_SUCCESS;
-}
-
-U_BOOT_CMD(
-       ncsi,   1,      1,      do_ncsi,
-       "Configure attached NIC via NC-SI",
-       ""
-);
-#endif  /* CONFIG_CMD_NCSI */