mtd: spi-nor-ids: Add support for XMC XM25QH64C

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

diff --git a/cmd/net.c b/cmd/net.c
index 237403977e8006c651182d01534912aaeeca9676..651c1411f4d78ffd6f6acf938a6dbe910bc35789 100644 (file)
--- a/cmd/net.c
+++ b/cmd/net.c
@@ -8,14 +8,20 @@
  * Boot support
  */
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
+#include <dm.h>
 #include <env.h>
+#include <image.h>
 #include <net.h>
+#include <net/udp.h>
+#include <net/sntp.h>
 
-static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
+static int netboot_common(enum proto_t, struct cmd_tbl *, int, char * const []);
 
 #ifdef CONFIG_CMD_BOOTP
-static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_bootp(struct cmd_tbl *cmdtp, int flag, int argc,
+                   char *const argv[])
 {
        return netboot_common(BOOTP, cmdtp, argc, argv);
 }
@@ -28,7 +34,7 @@ U_BOOT_CMD(
 #endif
 
 #ifdef CONFIG_CMD_TFTPBOOT
-int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int ret;
 
@@ -46,7 +52,8 @@ U_BOOT_CMD(
 #endif
 
 #ifdef CONFIG_CMD_TFTPPUT
-static int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_tftpput(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        return netboot_common(TFTPPUT, cmdtp, argc, argv);
 }
@@ -59,7 +66,8 @@ U_BOOT_CMD(
 #endif
 
 #ifdef CONFIG_CMD_TFTPSRV
-static int do_tftpsrv(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_tftpsrv(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        return netboot_common(TFTPSRV, cmdtp, argc, argv);
 }
@@ -76,7 +84,7 @@ U_BOOT_CMD(
 
 
 #ifdef CONFIG_CMD_RARP
-int do_rarpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_rarpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        return netboot_common(RARP, cmdtp, argc, argv);
 }
@@ -89,7 +97,8 @@ U_BOOT_CMD(
 #endif
 
 #if defined(CONFIG_CMD_DHCP)
-static int do_dhcp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        return netboot_common(DHCP, cmdtp, argc, argv);
 }
@@ -102,7 +111,8 @@ U_BOOT_CMD(
 #endif
 
 #if defined(CONFIG_CMD_NFS)
-static int do_nfs(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_nfs(struct cmd_tbl *cmdtp, int flag, int argc,
+                 char *const argv[])
 {
        return netboot_common(NFS, cmdtp, argc, argv);
 }
@@ -128,11 +138,15 @@ static void netboot_update_env(void)
                env_set("netmask", tmp);
        }
 
+#ifdef CONFIG_CMD_BOOTP
        if (net_hostname[0])
                env_set("hostname", net_hostname);
+#endif
 
+#ifdef CONFIG_CMD_BOOTP
        if (net_root_path[0])
                env_set("rootpath", net_root_path);
+#endif
 
        if (net_ip.s_addr) {
                ip_to_string(net_ip, tmp);
@@ -158,8 +172,10 @@ static void netboot_update_env(void)
                env_set("dnsip2", tmp);
        }
 #endif
+#ifdef CONFIG_CMD_BOOTP
        if (net_nis_domain[0])
                env_set("domain", net_nis_domain);
+#endif
 
 #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
        if (net_ntp_time_offset) {
@@ -175,8 +191,8 @@ static void netboot_update_env(void)
 #endif
 }
 
-static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
-               char * const argv[])
+static int netboot_common(enum proto_t proto, struct cmd_tbl *cmdtp, int argc,
+                         char *const argv[])
 {
        char *s;
        char *end;
@@ -186,10 +202,10 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
 
        net_boot_file_name_explicit = false;
 
-       /* pre-set load_addr */
+       /* pre-set image_load_addr */
        s = env_get("loadaddr");
        if (s != NULL)
-               load_addr = simple_strtoul(s, NULL, 16);
+               image_load_addr = hextoul(s, NULL);
 
        switch (argc) {
        case 1:
@@ -204,9 +220,9 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
                 * form must be written in a format which can not be
                 * mis-interpreted as a valid number.
                 */
-               addr = simple_strtoul(argv[1], &end, 16);
+               addr = hextoul(argv[1], &end);
                if (end == (argv[1] + strlen(argv[1]))) {
-                       load_addr = addr;
+                       image_load_addr = addr;
                        /* refresh bootfile name from env */
                        copy_filename(net_boot_file_name, env_get("bootfile"),
                                      sizeof(net_boot_file_name));
@@ -218,7 +234,7 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
                break;
 
        case 3:
-               load_addr = simple_strtoul(argv[1], NULL, 16);
+               image_load_addr = hextoul(argv[1], NULL);
                net_boot_file_name_explicit = true;
                copy_filename(net_boot_file_name, argv[2],
                              sizeof(net_boot_file_name));
@@ -227,8 +243,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
 
 #ifdef CONFIG_CMD_TFTPPUT
        case 4:
-               if (strict_strtoul(argv[1], 16, &save_addr) < 0 ||
-                   strict_strtoul(argv[2], 16, &save_size) < 0) {
+               if (strict_strtoul(argv[1], 16, &image_save_addr) < 0 ||
+                   strict_strtoul(argv[2], 16, &image_save_size) < 0) {
                        printf("Invalid address/size\n");
                        return CMD_RET_USAGE;
                }
@@ -271,7 +287,8 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
 }
 
 #if defined(CONFIG_CMD_PING)
-static int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_ping(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        if (argc < 2)
                return CMD_RET_USAGE;
@@ -319,7 +336,7 @@ static void cdp_update_env(void)
        }
 }
 
-int do_cdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_cdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int r;
 
@@ -342,7 +359,13 @@ U_BOOT_CMD(
 #endif
 
 #if defined(CONFIG_CMD_SNTP)
-int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static struct udp_ops sntp_ops = {
+       .prereq = sntp_prereq,
+       .start = sntp_start,
+       .data = NULL,
+};
+
+int do_sntp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        char *toff;
 
@@ -366,7 +389,7 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        else
                net_ntp_time_offset = simple_strtol(toff, NULL, 10);
 
-       if (net_loop(SNTP) < 0) {
+       if (udp_loop(&sntp_ops) < 0) {
                printf("SNTP failed: host %pI4 not responding\n",
                       &net_ntp_server);
                return CMD_RET_FAILURE;
@@ -383,7 +406,7 @@ U_BOOT_CMD(
 #endif
 
 #if defined(CONFIG_CMD_DNS)
-int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_dns(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        if (argc == 1)
                return CMD_RET_USAGE;
@@ -429,8 +452,8 @@ U_BOOT_CMD(
 #endif /* CONFIG_CMD_DNS */
 
 #if defined(CONFIG_CMD_LINK_LOCAL)
-static int do_link_local(cmd_tbl_t *cmdtp, int flag, int argc,
-                       char * const argv[])
+static int do_link_local(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        char tmp[22];
 
@@ -458,3 +481,48 @@ U_BOOT_CMD(
 );
 
 #endif  /* CONFIG_CMD_LINK_LOCAL */
+
+#ifdef CONFIG_DM_ETH
+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 struct cmd_tbl cmd_net[] = {
+       U_BOOT_CMD_MKENT(list, 1, 0, do_net_list, "", ""),
+};
+
+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, 2, 1, do_net,
+       "NET sub-system",
+       "list - list available devices\n"
+);
+#endif // CONFIG_DM_ETH